Merge pull request #1073 from dennishendriksen/master

Fix #1041 #1042 User/Superuser can't update account information