Removed username from User, using email instead + fixed closing of first-time registration