not deleting mappings when saving as there are multiple mappings that can exist for username + null point check
Merge remote-tracking branch 'origin/release' into release
updated login so it loads admin users with username instead of email