Merge pull request #1431 from lynnaloo/user_account_fix