Updated with validatePassword