diff --git a/mailServer/static/mailServer/mailServer.js b/mailServer/static/mailServer/mailServer.js
index dc162982e..f50b36a45 100755
--- a/mailServer/static/mailServer/mailServer.js
+++ b/mailServer/static/mailServer/mailServer.js
@@ -886,6 +886,11 @@ app.controller('emailForwarding', function ($scope, $http) {
 
     $scope.fetchCurrentForwardings = function () {
 
+        if($scope.forwardingOption == null || $scope.selectedEmail == null ){
+            $scope.forwardLoading = true;
+            return 0;
+        }
+
         $scope.creationBox = false;
         $scope.emailDetails = false;
         $scope.forwardLoading = false;
diff --git a/mailServer/templates/mailServer/emailForwarding.html b/mailServer/templates/mailServer/emailForwarding.html
index 7199ffdaa..deed9f909 100755
--- a/mailServer/templates/mailServer/emailForwarding.html
+++ b/mailServer/templates/mailServer/emailForwarding.html
@@ -51,7 +51,7 @@
                 <div ng-hide="emailDetails" class="form-group">
                     <label class="col-sm-3 control-label">{% trans "Select Email" %} </label>
                     <div class="col-sm-6">
-                        <select ng-model="selectedEmail" class="form-control">
+                        <select ng-change="selectForwardingEmail()" ng-model="selectedEmail" class="form-control">
                                 <option ng-repeat="email in emails track by $index">{$ email.email $}</option>
                         </select>
                     </div>
diff --git a/static/mailServer/mailServer.js b/static/mailServer/mailServer.js
index dc162982e..f50b36a45 100644
--- a/static/mailServer/mailServer.js
+++ b/static/mailServer/mailServer.js
@@ -886,6 +886,11 @@ app.controller('emailForwarding', function ($scope, $http) {
 
     $scope.fetchCurrentForwardings = function () {
 
+        if($scope.forwardingOption == null || $scope.selectedEmail == null ){
+            $scope.forwardLoading = true;
+            return 0;
+        }
+
         $scope.creationBox = false;
         $scope.emailDetails = false;
         $scope.forwardLoading = false;