* Displaying correct error while creating account
Merge remote-tracking branch 'upstream/master'