diff --git a/res/app/components/stf/keys/add-adb-key/adb-keys-service.js b/res/app/components/stf/keys/add-adb-key/adb-keys-service.js
index 045009d3..d8ef06dc 100644
--- a/res/app/components/stf/keys/add-adb-key/adb-keys-service.js
+++ b/res/app/components/stf/keys/add-adb-key/adb-keys-service.js
@@ -1,9 +1,9 @@
 module.exports = function AdbKeysServiceFactory() {
   var service = {}
 
-  service.hostNameFromKey = function (key) {
+  service.commentFromKey = function (key) {
     if (key.match(/.+= (.+)/)) {
-      return key.replace(/.+= (.+)/g, '$1').replace(/(\.local)?/g, '')
+      return key.replace(/.+= (.+)/g, '$1')
     }
     return ''
   }
diff --git a/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js b/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js
index db43c4f9..d6a71003 100644
--- a/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js
+++ b/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js
@@ -22,14 +22,16 @@ module.exports = function addAdbKeyDirective(AdbKeysService) {
         scope.addForm.title = ''
         scope.addForm.key = ''
         console.log('scope', scope)
-        // TODO: cannot access to the form by name?
+        // TODO: cannot access to the form by name inside a directive?
         //scope.adbkeyform.$setPristine()
         scope.showAdd = false
       }
 
       scope.$watch('addForm.key', function (newValue) {
         if (newValue && !scope.addForm.title) {
-          scope.addForm.title = AdbKeysService.hostNameFromKey(newValue)
+          // By default sets the title to the ADB key comment because
+          // usually it happens to be username@hostname.
+          scope.addForm.title = AdbKeysService.commentFromKey(newValue)
         }
       })