diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 00ecbfea3..7f8e13a3a 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -39,6 +39,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetAllow3rdPartyApi($values["preferences_general"]["thirdPartyApi"]);
                 Application_Model_Preference::SetTimezone($values["preferences_general"]["timezone"]);
                 Application_Model_Preference::SetWeekStartDay($values["preferences_general"]["weekStartDay"]);
+                Application_Model_Preference::SetEnableSystemEmail($values["preferences_general"]["enableSystemEmail"]);
                 Application_Model_Preference::SetSystemEmail($values["preferences_general"]["systemEmail"]);
 
                 Application_Model_Preference::SetAutoUploadRecordedShowToSoundcloud($values["preferences_soundcloud"]["UseSoundCloud"]);
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 801180bf5..772327582 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -794,7 +794,13 @@ class Application_Model_Preference
     }
     
     public static function GetEnableSystemEmail() {
-        return self::GetValue("enable_system_email");
+        $v =  self::GetValue("enable_system_email");
+        
+        if ($v === "") {
+            return 0;
+        }
+        
+        return $v;
     }
     
     public static function SetSystemEmail($value) {
diff --git a/airtime_mvc/application/views/scripts/form/login.phtml b/airtime_mvc/application/views/scripts/form/login.phtml
index 39c42cd59..f34f5d6b7 100644
--- a/airtime_mvc/application/views/scripts/form/login.phtml
+++ b/airtime_mvc/application/views/scripts/form/login.phtml
@@ -19,10 +19,12 @@
       <?php echo $this->element->getElement('password') ?>
     </dd>
     
-    <dt id="reset-label" class="hidden">&nbsp;</dt>
-    <dd id="reset-element" class="text-right">
-      <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset">Reset password</a>
-    </dd>
+    <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
+        <dt id="reset-label" class="hidden">&nbsp;</dt>
+        <dd id="reset-element" class="text-right">
+          <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset">Reset password</a>
+        </dd>
+    <?php endif; ?>
   
     <dt id="submit-label">&nbsp;</dt>
     <dd id="submit-element">
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 47e8f4c69..2aafaec03 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -420,6 +420,9 @@ var AIRTIME = (function(AIRTIME){
 			//remove any selected nodes before the draw.
 			"fnPreDrawCallback": function( oSettings ) {
 				
+				//make sure any dragging helpers are removed or else they'll be stranded on the screen.
+				$("#draggingContainer").remove();
+				
 				//disable jump to current button.
 				AIRTIME.button.disableButton("sb-button-delete");
 				//disable jump to current button.