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

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