Email/Password generation fixed