Updated Login & Registration 

Change-Id: I65a5998b99b05c563059a79683e80d0a8417faa1