diff --git a/bin/cli.js b/bin/cli.js
old mode 100644
new mode 100755
diff --git a/lib/CiscoSparkbot.js b/lib/CiscoSparkbot.js
index 6c2c88286..ee7e5fb89 100644
--- a/lib/CiscoSparkbot.js
+++ b/lib/CiscoSparkbot.js
@@ -183,6 +183,7 @@ function Sparkbot(configuration) {
 
             controller.api.messages.get(message.data).then(function(decrypted_message) {
 
+                message.userId = decrypted_message.personId;
                 message.user = decrypted_message.personEmail;
                 message.channel = decrypted_message.roomId;
                 message.text = decrypted_message.text;
@@ -240,6 +241,7 @@ function Sparkbot(configuration) {
         if (message.resource != 'messages' || message.event != 'created') {
 
             var event = message.resource + '.' + message.event;
+            message.userId = decrypted_message.personId;
             message.user = message.data.personEmail;
             message.channel = message.data.roomId;
             message.id = message.data.id;
@@ -247,14 +249,14 @@ function Sparkbot(configuration) {
 
             switch (event) {
                 case 'memberships.deleted':
-                    if (message.user === controller.identity.emails[0]) {
+                    if (message.userId === controller.identity.id) {
                         message.type = 'bot_space_leave';
                     } else {
                         message.type = 'user_space_leave';
                     }
                 break;
                 case 'memberships.created':
-                    if (message.user === controller.identity.emails[0]) {
+                    if (message.userId === controller.identity.id) {
                         message.type = 'bot_space_join';
                     } else {
                         message.type = 'user_space_join';
@@ -270,7 +272,7 @@ function Sparkbot(configuration) {
 
         // further categorize messages
         if (message.type == 'message_received') {
-            if (message.user === controller.identity.emails[0]) {
+            if (message.user === controller.identity.id) {
                 message.type = 'self_message';
             } else if (message.raw_message.data.roomType == 'direct') {
                 message.type = 'direct_message';