diff --git a/src/public/app/dialogs/options/other.js b/src/public/app/dialogs/options/other.js
index 99bde91ec..30ef661b6 100644
--- a/src/public/app/dialogs/options/other.js
+++ b/src/public/app/dialogs/options/other.js
@@ -30,7 +30,7 @@ const TPL = `
 
     <div class="form-group">
         <label for="image-max-width-height">Max width / height of an image in pixels (image will be resized if it exceeds this setting).</label>
-        <input class="form-control" id="image-max-width-height" type="number">
+        <input class="form-control" id="image-max-width-height" type="number" min="1">
     </div>
 
     <div class="form-group">
@@ -67,7 +67,7 @@ const TPL = `
 
     <div class="form-group">
         <label for="protected-session-timeout-in-seconds">Protected session timeout (in seconds)</label>
-        <input class="form-control" id="protected-session-timeout-in-seconds" type="number">
+        <input class="form-control" id="protected-session-timeout-in-seconds" type="number" min="60">
     </div>
 </div>
 
@@ -78,7 +78,7 @@ const TPL = `
 
     <div class="form-group">
         <label for="note-revision-snapshot-time-interval-in-seconds">Note revision snapshot time interval (in seconds)</label>
-        <input class="form-control" id="note-revision-snapshot-time-interval-in-seconds" type="number">
+        <input class="form-control" id="note-revision-snapshot-time-interval-in-seconds" type="number" min="10">
     </div>
 </div>
 
@@ -89,12 +89,12 @@ const TPL = `
 
     <div class="form-group">
         <label for="auto-readonly-size-text">Automatic readonly size (text notes)</label>
-        <input class="form-control" id="auto-readonly-size-text" type="number">
+        <input class="form-control" id="auto-readonly-size-text" type="number" min="0">
     </div>
 
     <div class="form-group">
         <label for="auto-readonly-size-code">Automatic readonly size (code notes)</label>
-        <input class="form-control" id="auto-readonly-size-code" type="number">
+        <input class="form-control" id="auto-readonly-size-code" type="number" min="0">
     </div>
 </div>`;
 
diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js
index d1d0c333c..63ddc375b 100644
--- a/src/routes/api/notes.js
+++ b/src/routes/api/notes.js
@@ -203,6 +203,10 @@ function changeTitle(req) {
 
     const noteTitleChanged = note.title !== title;
 
+    if (noteTitleChanged) {
+        noteService.saveNoteRevision(note);
+    }
+
     note.title = title;
 
     note.save();
diff --git a/src/services/notes.js b/src/services/notes.js
index 2b889793b..4dee6eb2b 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -918,5 +918,6 @@ module.exports = {
     getUndeletedParentBranchIds,
     triggerNoteTitleChanged,
     eraseDeletedNotesNow,
-    eraseNotesWithDeleteId
+    eraseNotesWithDeleteId,
+    saveNoteRevision
 };