Password is being retrieved for the password field
Password is working and did some cleanup on main methods