Added possibility to edit existing user name and email

+various cleanups and fixes