             @emailForm.buttons.Save.hideLoader()
             return notify err.message
 
-          options = {passwordConfirmed, email}
-          confirmCurrentPassword options, (err) =>
+          options = {skipPasswordConfirmation, email}
+          confirmCurrentPassword options, (err) ->
             if err
               notify err
               profileUpdated = false
               return queue.next()
-            passwordConfirmed = true
-            new VerifyPINModal 'Update E-Mail', (pin)=>
-              KD.remote.api.JUser.changeEmail {email, pin}, (err)=>
+            skipPasswordConfirmation = true
+            new VerifyPINModal 'Update E-Mail', (pin)->
+              KD.remote.api.JUser.changeEmail {email, pin}, (err)->
                 if err
                   notify err.message
                   profileUpdated = false

            notify "An error occured"
            return queue.next()

          passwordConfirmed = true unless user.passwordStatus is "valid"
          confirmCurrentPassword {passwordConfirmed}, (err) =>
            if err
              notify err
              profileUpdated = false

    ]
    daisy queue

  confirmCurrentPassword = ({skipPasswordConfirmation, email}, callback) ->
    return callback null if skipPasswordConfirmation
    new VerifyPasswordModal "Confirm", (currentPassword) ->
      options = {password: currentPassword, email}
      KD.remote.api.JUser.verifyPassword options, (err, confirmed) ->
