Reviewed fixes
Merge branch 'edit-user-details' of github.com:vinsol/vammer into edit-user-details