Fixing so username is set via a variable