Moved everything into one statement
Fixed username