diff --git a/www/js/controllers/settings-controllers.js b/www/js/controllers/settings-controllers.js
index ae54eec881be0d331f1d9668322a50dfe2815e2e..38178382d13179e79ba9516e934fddf67c60de26 100644
--- a/www/js/controllers/settings-controllers.js
+++ b/www/js/controllers/settings-controllers.js
@@ -201,7 +201,7 @@ function SettingsController($scope, $q, $ionicPopup, $timeout, $translate, csHtt
 
   $scope.showActionsPopover = function(event) {
     if (!$scope.actionsPopover) {
-      $ionicPopover.fromTemplateUrl('templates/settings/lookup_popover_actions.html', {
+      $ionicPopover.fromTemplateUrl('templates/settings/popover_actions.html', {
         scope: $scope
       }).then(function(popover) {
         $scope.actionsPopover = popover;
diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js
index b6716baff434081193869c6cc3444956cf440d99..dc96852a11c0aed628e3e5afc8b74d76c2ffd59e 100644
--- a/www/js/controllers/wallet-controllers.js
+++ b/www/js/controllers/wallet-controllers.js
@@ -60,17 +60,6 @@ function WalletController($scope, $rootScope, $q, $ionicPopup, $timeout, $state,
       });
   });
 
-  $ionicPopover.fromTemplateUrl('templates/wallet/lookup_popover_actions.html', {
-    scope: $scope
-  }).then(function(popover) {
-    $scope.actionsPopover = popover;
-  });
-
-  //Cleanup the popover when we're done with it!
-  $scope.$on('$destroy', function() {
-    $scope.actionsPopover.remove();
-  });
-
   $scope.onSettingsChanged = function() {
     if (!$scope.walletData || $scope.loading) return;
     $scope.unit = $filter('currencySymbol')($scope.walletData.currency, csSettings.data.useRelative);
@@ -532,7 +521,7 @@ function WalletController($scope, $rootScope, $q, $ionicPopup, $timeout, $state,
 
   $scope.showActionsPopover = function(event) {
     if (!$scope.actionsPopover) {
-      $ionicPopover.fromTemplateUrl('templates/wallet/lookup_popover_actions.html', {
+      $ionicPopover.fromTemplateUrl('templates/wallet/popover_actions.html', {
         scope: $scope
       }).then(function(popover) {
         $scope.actionsPopover = popover;
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index d598e60f13a45aa42cb0da00b3fd165fdc79c414..19c96fe4bc86b26a08d84c80ab4b6f2797f52d2a 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -1258,7 +1258,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser
     */
     self = function(uid, needToLoadRequirements) {
       if (!BMA.regex.USER_ID.test(uid)){
-        throw new Error('ERROR.INVALID_USER_ID');
+        return $q.reject({message: 'ERROR.INVALID_USER_ID'});
       }
       var block;
       return $q.all([