Login Working with username not email
Code Merged