diff --git a/src/option.c b/src/option.c
index 8b63938..35cfd2b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4918,7 +4918,10 @@
 			*(char_u **)(varp) = newval;
 
 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
-			if (!starting && options[opt_idx].indir != PV_KEY
+			if (!starting
+# ifdef FEAT_CRYPT
+				&& options[opt_idx].indir != PV_KEY
+# endif
 							   && origval != NULL)
 			    /* origval may be freed by
 			     * did_set_string_option(), make a copy. */
@@ -5717,7 +5720,11 @@
 	*varp = s;
 
 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
-	if (!starting && options[opt_idx].indir != PV_KEY)
+	if (!starting
+# ifdef FEAT_CRYPT
+		&& options[opt_idx].indir != PV_KEY
+# endif
+		)
 	    saved_oldval = vim_strsave(oldval);
 #endif
 	if ((r = did_set_string_option(opt_idx, varp, TRUE, oldval, NULL,
diff --git a/src/version.c b/src/version.c
index fe17b71..aa7b033 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    788,
+/**/
     787,
 /**/
     786,