removed password confirmation
merge