Removed unnessecary else
Added password validation at model
I am now checking if user is set