Added saving the username