           queue.next()
 
       ->
+        # why do we need to create a separate client?
         _client =
           connection : delegate : account
-          context    : group    : 'koding'
+          context    : group    : client.context.group
 
         ComputeProvider.createGroupStack _client, (err)->
           if err?

          return callback createKodingError "Could not update your session"

        if session?
          session.update { $set: { clientId: newToken, username }}, (err) ->
            return callback err  if err?
            callback null, newToken
        else

      callback null

  @changeUsernameByAccount = (options, callback)->
    { account, username, clientId, isRegistration, groupName } = options
    account.changeUsername { username, isRegistration }, (err) =>
      return callback err   if err?
      return callback null  unless clientId?
