save account username as user username
Merge branch 'tweaks'