diff --git a/dev/Sieve/Grammar.js b/dev/Sieve/Grammar.js
index 5fb21c71e..a113374c5 100644
--- a/dev/Sieve/Grammar.js
+++ b/dev/Sieve/Grammar.js
@@ -45,8 +45,16 @@ export class GrammarString /*extends String*/
 /**
  * abstract
  */
-export class GrammarComment extends GrammarString
+export /*abstract*/ class GrammarComment extends GrammarString
 {
+/*
+	constructor()
+	{
+		if (this.constructor == GrammarComment) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+	}
+*/
 }
 
 /**
diff --git a/dev/Sieve/Parser.js b/dev/Sieve/Parser.js
index 6d36eea04..9f0892061 100644
--- a/dev/Sieve/Parser.js
+++ b/dev/Sieve/Parser.js
@@ -18,6 +18,7 @@ import {
 import {
 	GrammarBracketComment,
 	GrammarCommand,
+	GrammarComment,
 	GrammarHashComment,
 	GrammarMultiLine,
 	GrammarNumber,
@@ -28,7 +29,7 @@ import {
 } from 'Sieve/Grammar';
 
 import { availableCommands } from 'Sieve/Commands';
-import { ConditionalCommand, RequireCommand } from 'Sieve/Commands/Controls';
+import { ConditionalCommand, IfCommand, RequireCommand } from 'Sieve/Commands/Controls';
 import { NotTest } from 'Sieve/Commands/Tests';
 
 const
@@ -156,10 +157,17 @@ export const parseScript = (script, name = 'script.sieve') => {
 			let new_command;
 			if (Commands[value]) {
 				if ('elsif' === value || 'else' === value) {
-//					(prev_command instanceof ConditionalCommand) || error('Not after IF condition');
-				}
-				if ('allof' === value || 'anyof' === value) {
-//					(command instanceof ConditionalCommand || command instanceof NotTest) || error('Test-list not in conditional');
+					let valid = false, cmd = (command ? command?.commands : tree), i = cmd?.length;
+					while (i) {
+						cmd[--i];
+						if (cmd[i] instanceof IfCommand) {
+							valid = true;
+							break;
+						} else if (typeof cmd[i] !== 'string' && !(cmd[i] instanceof GrammarComment)) {
+							break;
+						}
+					}
+					valid || error('Not after IF/ELSIF condition');
 				}
 				new_command = new Commands[value]();
 			} else {
@@ -266,7 +274,6 @@ export const parseScript = (script, name = 'script.sieve') => {
 			break;
 		case T_BLOCK_END:
 			(command instanceof ConditionalCommand) || error(TokenError[type]);
-//			prev_command = command;
 			command = levels.up();
 			break;
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index 2ebd054d1..3c0e2ff12 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -11,7 +11,7 @@
 
 	<div class="control-group" data-bind="css: {'error': nameError}, hidden: exists">
 		<input type="text" class="span5"
-			data-bind="value: name, hasfocus: !exists()"
+			data-bind="value: name"
 			autocorrect="off" autocapitalize="off"
 			data-i18n="[placeholder]GLOBAL/NAME">
 	</div>