 
         # Remove all waiting pins for given action and email
         @remove {username, action}, (err, count)->
-          if err then console.warn err
-          else
-            if count > 0 then console.log "#{count} expired PIN removed."
-            else console.log "No such waiting PIN found."
 
-            # Create a random pin
-            pin = hat 16
+          return console.warn err  if err
 
-            # Create and send new pin
-            confirmation = new JVerificationToken {username, action, email, pin}
-            confirmation.save (err)->
-              if err
-                callback err
-              else
-                confirmation.sendEmail {subject, firstName}, callback
+          if count > 0 then console.log "#{count} expired PIN removed."
+          else console.log "No such waiting PIN found."
+
+          # Create a random pin
+          pin = hat 16
+
+          # Create and send new pin
+          confirmation = new JVerificationToken {username, action, email, pin}
+          confirmation.save (err)->
+            if err
+              callback err
+            else
+              confirmation.sendEmail {subject, firstName, action}, callback
 
 
   @confirmByPin = (options, callback)->

        callback null, false


  sendEmail: ({subject, firstName}, callback)->

    JMail = require './email'



          if createdAt < 20 # min
            if resendIfExists
              confirmation.sendEmail {subject, firstName, action}, callback
            else
              callback if err then err else new PINExistsError \
                "PIN exists and not expired,
