Added some form validation to the Login form
Fixed a conflict