diff --git a/node_modules/c9/format-user-analytics.js b/node_modules/c9/format-user-analytics.js
index 28d737fb..b70517ae 100644
--- a/node_modules/c9/format-user-analytics.js
+++ b/node_modules/c9/format-user-analytics.js
@@ -11,7 +11,7 @@ define(function(require, exports, module) {
         if (!user) return {}; // empty traits get ignored
 
          var traits = {
-                uid: user.id || user.uid,
+                uid: user.id,
                 username: user.name || user.username,
                 email: user.email,
                 createdAt: user.date_add,
diff --git a/node_modules/c9/skip-analytics.js b/node_modules/c9/skip-analytics.js
index f0f2e024..6c5fa421 100644
--- a/node_modules/c9/skip-analytics.js
+++ b/node_modules/c9/skip-analytics.js
@@ -12,9 +12,9 @@ define(function(require, exports, module) {
 
     function skipAnalytics(userId, name, email, allowUnauthorized) {
 
-        if (typeof userId == "object" && !name) {
+        if (typeof userId == "object") {
             var user = userId;
-            return skipAnalytics(user.id, user.name || user.username, user.email); // make it backwards for the client
+            return skipAnalytics(user.id, user.name || user.username, user.email, name); // make it backwards compatible for the client
         }
         
         if (!allowUnauthorized && userId === -1) return true;