diff --git a/public/modules/forms/admin/css/edit-form-configure.css b/public/modules/forms/admin/css/edit-form-configure.css
index 248584bb..afe5b2b2 100644
--- a/public/modules/forms/admin/css/edit-form-configure.css
+++ b/public/modules/forms/admin/css/edit-form-configure.css
@@ -11,6 +11,7 @@
     white-space: nowrap;
     vertical-align: middle;
     cursor: pointer !important;
+    pointer-events: none;
 }
 
 .email-subject.ta-root .ta-editor.ta-html, .email-subject .ta-scroll-window.form-control {
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 a6b8be04..443e4a6f 100644
--- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
+++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
@@ -70,6 +70,7 @@
 
             <div class="col-sm-12 field-input">
                 <text-angular class="email-subject" ng-model="myform.respondentNotifications.htmlTemplate" ta-toolbar="[['bold','italics', 'insertField']]"></text-angular>
+                <div ng-bind="myform.respondentNotifications.htmlTemplate"></div>
             </div>
         </div>
     </div>
diff --git a/public/modules/forms/config/forms.client.config.js b/public/modules/forms/config/forms.client.config.js
index 64da7c2c..ca71e83c 100644
--- a/public/modules/forms/config/forms.client.config.js
+++ b/public/modules/forms/config/forms.client.config.js
@@ -70,7 +70,7 @@ angular.module('forms').run(['Menus',
 					</ul>\
 				</div>',
             onClickField: function(field_id, field_name){
-            	this.$editor().wrapSelection('insertHTML', '<var class="tag" contenteditable="false" id="field:' + field_id + '">' + field_name + '</var>', true);
+            	this.$editor().wrapSelection('insertHTML', '<var class="tag" contenteditable="false" ta-readonly="true" id="field:' + field_id + '">' + field_name + '</var>', false);
             },
             action: function(){
             }
diff --git a/public/modules/users/controllers/authentication.client.controller.js b/public/modules/users/controllers/authentication.client.controller.js
index dc59f9f1..82346f31 100755
--- a/public/modules/users/controllers/authentication.client.controller.js
+++ b/public/modules/users/controllers/authentication.client.controller.js
@@ -9,7 +9,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
 		$scope.forms = {};
 
 	    $scope.signin = function() {
-	    	if($scope.forms && $scope.forms.hasOwnProperty('siginForm') && !$scope.forms.signinForm.$invalid){
+	    	if($scope.forms && $scope.forms.signinForm.$valid){
 				User.login($scope.credentials).then(
 					function(response) {
 						Auth.login(response);
@@ -38,7 +38,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
 	    		return;
 	    	}
 
-	    	if(!$scope.forms.signupForm.$invalid){
+	    	if($scope.forms && $scope.forms.signupForm.$valid){
 		        User.signup($scope.credentials).then(
 			        function(response) {
 			        	$state.go('signup-success');