diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js
index c04d7bdc..805f7864 100644
--- a/app/controllers/forms.server.controller.js
+++ b/app/controllers/forms.server.controller.js
@@ -462,7 +462,7 @@ exports.formByID = function(req, res, next, id) {
 	}
 
 	Form.findById(id)
-		.select('admin title language form_fields startPage endPage hideFooter isLive design analytics.gaCode')
+		.select('admin title language form_fields startPage endPage hideFooter isLive design analytics.gaCode respondentNotifications selfNotifications')
 		.populate('admin')
 		.exec(function(err, form) {
 		if (err) {
diff --git a/public/modules/forms/admin/directives/configure-form.client.directive.js b/public/modules/forms/admin/directives/configure-form.client.directive.js
index a1caa7c5..0d206f3c 100644
--- a/public/modules/forms/admin/directives/configure-form.client.directive.js
+++ b/public/modules/forms/admin/directives/configure-form.client.directive.js
@@ -14,6 +14,8 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil
                 $scope.resetForm = $rootScope.resetForm;
                 $scope.update = $rootScope.update;
 
+                console.log($scope.myform);
+
                 $scope.$evalAsync(function() {
                     angular.element('.tag')
                 });
diff --git a/public/modules/forms/admin/directives/edit-form.client.directive.js b/public/modules/forms/admin/directives/edit-form.client.directive.js
index 33288fed..f93823c8 100644
--- a/public/modules/forms/admin/directives/edit-form.client.directive.js
+++ b/public/modules/forms/admin/directives/edit-form.client.directive.js
@@ -302,12 +302,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
 						newField.fieldValue = 0;
 					}
 
-					if(fieldType === 'dropdown' || fieldType === 'radio'){
-						newField.fieldOptions = [{
-							option_value: 'Option1'
-						}];
-					}
-
 					$scope.openEditModal(newField, false, $scope.myform.form_fields.length);
                 };
 
diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html
index 2815e6f3..bc228506 100644
--- a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html
+++ b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html
@@ -39,7 +39,7 @@
             </div>
 
             <div class="field-input col-sm-4 text-right">
-            	<input class="toggle-switch" type="checkbox" name="my-checkbox" 
+            	<input class="toggle-switch" type="checkbox"
             		bs-switch ng-model="myform.isLive"
             		switch-on-text="{{ 'PUBLIC' | translate }}"
             		switch-off-text="{{ 'PRIVATE' | translate }}"
diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
index a15da9ce..545532af 100644
--- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
+++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
@@ -1,5 +1,12 @@
 <div class="row">
     <div class="col-sm-offset-2 col-sm-10">
+
+        <div class="row field" ng-if="!formHasEmailField">
+            <strong>
+                {{ 'NO_EMAIL_FIELD_WARNING' | translate }}
+            </strong>
+        </div>
+
         <div class="row field">
             <div class="notification-row">
                 <i class="status-light status-light-on fa fa-circle" ng-if="myform.respondentNotifications.enabled"></i>
@@ -13,7 +20,10 @@
                 <input class="toggle-switch notification-toggle" type="checkbox" switch-size="small"
                     bs-switch ng-model="myform.respondentNotifications.enabled"
                     switch-on-text="{{ 'ON' | translate }}"
-                    switch-off-text="{{ 'OFF' | translate }}">
+                    switch-off-text="{{ 'OFF' | translate }}"
+                    ng-disabled="!formHasEmailField"
+                    ng-true-value="true"
+                    ng-false-value="false">
             </div>
         </div>
 
@@ -35,12 +45,6 @@
             </div>
         </div>
 
-        <div class="row field" ng-if="!formHasEmailField">
-            <strong>
-                {{ 'NO_EMAIL_FIELD_WARNING' | translate }}
-            </strong>
-        </div>
-
         <div class="row field">
             <div class="field-title col-sm-12">
                 <h5>{{ 'REPLY_TO' | translate }}:</h5>