QA Changes/Fixes
* Remember username on error

Change-Id: Ia3e11123ab5996d71a60e5121cf470a5ed114aae