diff --git a/include/ajax.draft.php b/include/ajax.draft.php
index 3b8fba5b5f0da1f5ee37360fde77e22e7c792eab..6743b328030774e5053cd137a7a91850301f91e1 100644
--- a/include/ajax.draft.php
+++ b/include/ajax.draft.php
@@ -7,7 +7,7 @@ require_once(INCLUDE_DIR.'class.draft.php');
 class DraftAjaxAPI extends AjaxController {
 
     function _createDraft($vars) {
-        if (!($vars['body'] = self::_findDraftBody($_POST)))
+        if (false === ($vars['body'] = self::_findDraftBody($_POST)))
             return JsonDataEncoder::encode(array(
                 'error' => __("Draft body not found in request"),
                 'code' => 422,
@@ -34,7 +34,7 @@ class DraftAjaxAPI extends AjaxController {
     }
 
     function _updateDraft($draft) {
-        if (!($body = self::_findDraftBody($_POST)))
+        if (false === ($body = self::_findDraftBody($_POST)))
             return JsonDataEncoder::encode(array(
                 'error' => array(
                     'message' => "Draft body not found in request",
@@ -127,8 +127,7 @@ class DraftAjaxAPI extends AjaxController {
             'namespace' => $namespace,
         );
 
-        $info = self::_createDraft($vars);
-        $info['draft_id'] = $namespace;
+        return self::_createDraft($vars);
     }
 
     function getDraftClient($namespace) {
@@ -320,6 +319,8 @@ class DraftAjaxAPI extends AjaxController {
                 return urldecode($vars[$field]);
             }
         }
+
+        return false;
     }
 
 }
diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index ba85e301f8482f12ca7abe3add593857b1d27e4d..07f9eaaafb71d6459f4c9b50c26809f37b96b56f 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -86,7 +86,7 @@ RedactorPlugins.draft = {
             // No change yet — dont't show the button
             return;
         }
-        if (data) {
+        if (data && this.get()) {
             this.$draft_saved.show().delay(5000).fadeOut();
         }
         // Show the button if there is a draft to delete
@@ -126,6 +126,7 @@ RedactorPlugins.draft = {
                 self.set(self.opts.draftOriginal || '', false, false);
                 self.opts.autosave = self.opts.autoCreateUrl;
                 self.draftDeleteButton.hide();
+                self.firstSave = false;
             }
         });
     }