         if username? and email?
           options = { account, oldUsername, email, username }
           @changeEmailByUsername options, (err) =>
-            return callback err  if err?
+            return callback err  if err
             queue.next()
         else process.nextTick -> queue.next()
       ->

          queue.next()
      =>
        @addToGroups account, invite, user.email, (err) =>
          return callback err  if err?
          queue.next()
      =>
        @removeFromGuestsGroup account, (err) =>
          return callback err  if err?
          queue.next()
      ->
        accountModifier = $set:

        if username?
          options = { account, username, clientId, isRegistration: yes }
          @changeUsernameByAccount options, (err, newToken_) =>
            return callback err  if err
            newToken = newToken_
            queue.next()
        else process.nextTick -> queue.next()
