diff --git a/package.json b/package.json
index 4fc95a28870b95233ceb70149218651d2ae55d30..113a4da65a720617de837b5617ebacb7c58a2444 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
   "dependencies": {
     "@bower_components/Leaflet.EasyButton": "CliffCloud/Leaflet.EasyButton#^2.4.0",
     "@bower_components/Leaflet.FeatureGroup.SubGroup": "VivekKhandre/Leaflet.FeatureGroup.SubGroup#0.1.2",
+    "@bower_components/Leaflet.awesome-markers": "lvoogdt/Leaflet.awesome-markers#2.0.2",
     "@bower_components/aes-js": "ricmoo/aes-js#3.1.2",
     "@bower_components/angular": "angular/bower-angular#~1.5.11",
     "@bower_components/angular-animate": "angular/bower-angular-animate#~1.5.11",
@@ -62,7 +63,6 @@
     "@bower_components/js-scrypt": "tonyg/js-scrypt#1.2.0",
     "@bower_components/leaflet": "Leaflet/Leaflet#0.7.7",
     "@bower_components/leaflet-search": "stefanocudini/leaflet-search#2.7.2",
-    "@bower_components/Leaflet.awesome-markers": "lvoogdt/Leaflet.awesome-markers#2.0.2",
     "@bower_components/leaflet.loading": "ebrelsford/Leaflet.loading#^0.1.24",
     "@bower_components/leaflet.markercluster": "Leaflet/Leaflet.markercluster#0.5.0",
     "@bower_components/moment": "moment/moment#^2.24.0",
@@ -216,4 +216,4 @@
   "engines": {
     "yarn": ">= 1.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/www/plugins/es/js/controllers/wot-controllers.js b/www/plugins/es/js/controllers/wot-controllers.js
index 4ac6d8ed6c890e794adaa165884c92d8ce9f7fea..44f9461da0037478858c356824570376eab6ece7 100644
--- a/www/plugins/es/js/controllers/wot-controllers.js
+++ b/www/plugins/es/js/controllers/wot-controllers.js
@@ -312,7 +312,7 @@ function ESWotIdentityViewController($scope, $ionicPopover, $q, $controller, UIU
       $scope.$on('$csExtension.motion', function(event) {
         var canCompose = !!$scope.formData.profile;
         if (canCompose) {
-          $scope.showFab('fab-compose-' + $scope.formData.uid);
+          $scope.showFab('fab-compose-' + $scope.formData.pubkey);
         }
       });
   }
diff --git a/www/plugins/es/templates/wot/view_identity_extend.html b/www/plugins/es/templates/wot/view_identity_extend.html
index 5b21ebefec125c2fc8385421c9eaae75bf9a3b34..a5aa6df8a6f55dc669ebe60369d13df9a1c323ff 100644
--- a/www/plugins/es/templates/wot/view_identity_extend.html
+++ b/www/plugins/es/templates/wot/view_identity_extend.html
@@ -8,7 +8,7 @@
 
 <!-- Top fab buttons -->
 <ng-if ng-if=":state:enable && extensionPoint === 'buttons-top-fab'">
-  <button id="fab-compose-{{:rebind:formData.uid}}"
+  <button id="fab-compose-{{:rebind:formData.pubkey}}"
           class="button button-fab button-fab-top-left button-fab-hero mini button-stable spin"
           style="left: 88px;"
           ng-click="showNewMessageModal()">