diff --git a/src/developer.js b/src/developer.js
index e2f3b5603..38e163db0 100644
--- a/src/developer.js
+++ b/src/developer.js
@@ -38,9 +38,9 @@ util.inherits(DeveloperError, Error);
 DeveloperError.INTERNAL_ERROR = 'Internal Error';
 DeveloperError.EXTERNAL_ERROR = 'External Error';
 
-function issueDeveloperToken(userObject, auditSource, callback) {
+function issueDeveloperToken(userObject, ip, callback) {
     assert.strictEqual(typeof userObject, 'object');
-    assert.strictEqual(typeof auditSource, 'object');
+    assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     var token = tokendb.generateToken();
@@ -50,7 +50,7 @@ function issueDeveloperToken(userObject, auditSource, callback) {
     tokendb.add(token, userObject.id, 'cid-cli', expiresAt, scopes, function (error) {
         if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
 
-        eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource, { authType: 'cli', userId: userObject.id, user: user.removePrivateFields(userObject) });
+        eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'cli', ip: ip }, { userId: userObject.id, user: user.removePrivateFields(userObject) });
 
         callback(null, { token: token, expiresAt: new Date(expiresAt).toISOString() });
     });
diff --git a/src/routes/developer.js b/src/routes/developer.js
index ccb727564..cfa62378a 100644
--- a/src/routes/developer.js
+++ b/src/routes/developer.js
@@ -9,17 +9,14 @@ var developer = require('../developer.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess;
 
-function auditSource(req) {
-    var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
-    return { ip: ip, username: req.user ? req.user.username : null, userId: req.user ? req.user.id : null };
-}
-
 function login(req, res, next) {
     passport.authenticate('local', function (error, user) {
         if (error) return next(new HttpError(500, error));
         if (!user) return next(new HttpError(401, 'Invalid credentials'));
 
-        developer.issueDeveloperToken(user, auditSource(req), function (error, result) {
+        var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
+
+        developer.issueDeveloperToken(user, ip, function (error, result) {
             if (error) return next(new HttpError(500, error));
 
             next(new HttpSuccess(200, { token: result.token, expiresAt: result.expiresAt }));