Review and changes from Jocelyn Fiat

the code could probably use constant string for "username".
not critical