diff --git a/app/js/controllers.js b/app/js/controllers.js
index 3b5823a8..c71becca 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -118,6 +118,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
         updateCountry();
       }
       $scope.$broadcast('country_selected');
+      $scope.$broadcast('value_updated');
     }
 
     function updateCountry () {
diff --git a/app/js/directives.js b/app/js/directives.js
old mode 100644
new mode 100755
index 7f5b0edf..de1d4cc8
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -2525,14 +2525,18 @@ angular.module('myApp.directives', ['myApp.filters'])
       });
 
       if (!isDisabled) {
-        input.on('blur focus', function (e) {
+        input.on('blur focus change', function (e) {
           focused = e.type == 'focus';
           element.toggleClass('md-input-focused', focused);
           updateHasValueClass();
         });
       }
 
-
+      $scope.$on('value_updated', function (event, args) {
+        setZeroTimeout(function () {
+          updateHasValueClass();
+        });
+      });
     };
   })