diff --git a/desktop-app/css/app.css b/desktop-app/css/app.css
index db6091d..78a867e 100644
--- a/desktop-app/css/app.css
+++ b/desktop-app/css/app.css
@@ -250,6 +250,13 @@ html, body, body > div.ng-scope {
     white-space: pre-wrap;
 }
 
+.identification {
+}
+
+.userid, .token {
+    text-align: center;
+}
+
 .bio.edit {
     width: 100%;
 }
diff --git a/desktop-app/js/tinder-desktop.profile.js b/desktop-app/js/tinder-desktop.profile.js
index d622725..c24e33f 100644
--- a/desktop-app/js/tinder-desktop.profile.js
+++ b/desktop-app/js/tinder-desktop.profile.js
@@ -1,14 +1,17 @@
 (function() {
-  var module = angular.module('tinder-desktop.profile', ['ngRoute', 'tinder-desktop.api', 'tinder-desktop.common']);
+  var module = angular.module('tinder-desktop.profile', ['ngRoute', 'tinder-desktop.api', 'tinder-desktop.common', 'tinder-desktop.settings']);
 
-  module.controller('ProfileController', function($scope, $route, $routeParams, API) {
+  module.controller('ProfileController', function($scope, $route, $routeParams, API, Settings) {
     API.userInfo($routeParams.userId).then(function(user) {
       $scope.user = user;
       $scope.bioTextArea = $scope.user.bio;
     });
 
 
+    $scope.showFbInfo = Settings.get('show_fb_token') === "yes";
     $scope.isMe = (localStorage['userId'] === $routeParams.userId);
+    $scope.token = (localStorage['tinderToken']);
+    $scope.userid = (localStorage['fbUserId']);
     $scope.backLink = (localStorage.userId === $routeParams.userId) ? '#/swipe' : '#/messages';
     $scope.photoIndex = 0;
     $scope.swapPhoto = function(index) {
diff --git a/desktop-app/js/tinder-desktop.settings.js b/desktop-app/js/tinder-desktop.settings.js
index 7f2e68d..a8050b6 100644
--- a/desktop-app/js/tinder-desktop.settings.js
+++ b/desktop-app/js/tinder-desktop.settings.js
@@ -11,7 +11,8 @@
         // set defaults here
         landingPage : '/swipe',
         messageListExtraInfo : 'yes',
-        distanceUnits: 'mi'
+        distanceUnits: 'mi',
+        show_fb_token: "no"
       }
     };
 
diff --git a/desktop-app/locales/en.json b/desktop-app/locales/en.json
index bb5ca46..830b044 100644
--- a/desktop-app/locales/en.json
+++ b/desktop-app/locales/en.json
@@ -27,7 +27,11 @@
     "TITLE": "Profile",
     "AWAY": "away",
     "ACTIVE": "active",
-    "AT": "at"
+    "AT": "at",
+    "SHOW": "Show",
+    "HIDE": "Hide",
+    "TOKEN": "Token",
+    "FB_USER_ID": "Facebook user id"
   },
   "SETTINGS": {
     "TITLE": "Settings",
@@ -42,6 +46,9 @@
     "DISTANCE_UNITS": "Distance Units",
     "MILES": "Miles",
     "KILOMETRES": "Kilometres",
+    "DISPLAY_FB_TOKEN": "Display Facebook token on my Profile",
+    "FB_TOKEN_ON": "Display Facebook user ID and token",
+    "FB_TOKEN_OFF": "Hide Facebook user ID and token",
     "LOGOUT": "Logout",
     "CLICK_TO_LOGOUT": "Click to Logout"
   },
diff --git a/desktop-app/templates/profile.html b/desktop-app/templates/profile.html
index a714df8..ec405bd 100644
--- a/desktop-app/templates/profile.html
+++ b/desktop-app/templates/profile.html
@@ -16,6 +16,15 @@ <h1 class="name fader">
               {{user.birth_date | bdayToAge}}&nbsp;
             </h1>
             <h3 class="status fader">{{user.distance_mi | distanceToUnits}} {{'PROFILE.AWAY' | translate}}, {{'PROFILE.ACTIVE' | translate}} {{user.ping_time | timeFromNow}}</h3>
+            <div class="identification" ng-show="isMe && showFbInfo">
+              <div class="userid">{{'PROFILE.FB_USER_ID' | translate}}: {{ userid }}</div>
+              <div class="token">
+                 {{'PROFILE.TOKEN' | translate}}:
+                 <a href ng-show="!showToken" ng-click="showToken = true">{{'PROFILE.SHOW' | translate}}</a>
+                 <ng-show ng-show="showToken">{{ token }}</ng-show>
+                 <a href ng-show="showToken" ng-click="showToken = false">{{'PROFILE.HIDE' | translate}}</a>
+              </div>
+            </div>
             <p class="schoolwork fader">
               <i ng-repeat="school in user.schools" class="school fa fa-graduation-cap">{{school.name}}</i>
               <i ng-repeat="job in user.jobs" class="work fa fa-briefcase">
diff --git a/desktop-app/templates/settings.html b/desktop-app/templates/settings.html
index 254ae0a..8ab26e8 100644
--- a/desktop-app/templates/settings.html
+++ b/desktop-app/templates/settings.html
@@ -60,6 +60,21 @@
 
     <br/>
 
+    <fieldset>
+      <legend translate="SETTINGS.DISPLAY_FB_TOKEN"></legend>
+      <label for="fbToken_1">
+        <input type="radio" name="fbToken" id="fbToken_1" value="yes" ng-model="settings.show_fb_token" ng-change="syncSettings()"/>
+        {{'SETTINGS.FB_TOKEN_ON' | translate}}
+      </label>
+      <br/>
+      <label for="fbToken_2">
+        <input type="radio" name="fbToken" id="fbToken_2" value="no" ng-model="settings.show_fb_token" ng-change="syncSettings()"/>
+        {{'SETTINGS.FB_TOKEN_OFF' | translate}}
+      </label>
+    </fieldset>
+
+    <br/>
+
     <fieldset>
       <legend translate="SETTINGS.LOGOUT"></legend>
       <a href="" ng-click="logout()" translate="SETTINGS.CLICK_TO_LOGOUT"></a>