Updated strings and added basic input validation for login
Merge