diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index 9c4117204..1c34f6d0a 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -8,9 +8,9 @@ angular.module('copayApp.controllers').controller('AddressesController',
 
     $scope.loading = false;
     $scope.showAll = false;
-    var w = $rootScope.wallet;
 
     $scope.newAddr = function() {
+      var w = $rootScope.wallet;
       $scope.loading = true;
       w.generateAddress(null, function() {
         $timeout(function() {
diff --git a/js/controllers/head.js b/js/controllers/head.js
index 47b922c95..cf40580f9 100644
--- a/js/controllers/head.js
+++ b/js/controllers/head.js
@@ -1,15 +1,14 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, notification, controllerUtils) {
-
-  $scope.username = $rootScope.iden ? $rootScope.iden.fullName || $rootScope.iden.email : 'undefined';
+  $scope.username = $rootScope.iden.getName();
   $scope.hoverMenu = false;
 
-  $scope.hoverIn = function(){
+  $scope.hoverIn = function() {
     this.hoverMenu = true;
   };
 
-  $scope.hoverOut = function(){
+  $scope.hoverOut = function() {
     this.hoverMenu = false;
   };
 
@@ -53,4 +52,3 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
     });
   }
 });
-