TK-4: Remember the username
Merge pull request #6 from HunkD/TK-4

TK-4: Remember the username