diff --git a/src/onbeyond/z3/z3.s b/src/onbeyond/z3/z3.s
index df90d1f..74c4694 100644
--- a/src/onbeyond/z3/z3.s
+++ b/src/onbeyond/z3/z3.s
@@ -10,7 +10,7 @@
                 ;user-defined options
                 verbose_info = 0        ;set to 1 to enable display of memory usage
 
-gamename=$306
+gamename=$307
 savename=$350
 scrpname=$390
 
@@ -99,7 +99,8 @@ op_c7
         dey
         bne     -
 
-        lda     $305
+        lda     $306
+        eor     $305
         eor     $304
         eor     $303
         eor     $302
diff --git a/src/onbeyond/z4/z4.s b/src/onbeyond/z4/z4.s
index 5c03e7a..a1ccb9e 100644
--- a/src/onbeyond/z4/z4.s
+++ b/src/onbeyond/z4/z4.s
@@ -338,7 +338,8 @@ slot            lda     $cfff
                 iny
                 bne     -
 
-                lda     $305
+                lda     $306
+                eor     $305
                 eor     $304
                 eor     $303
                 eor     $302
@@ -351,6 +352,7 @@ slot            lda     $cfff
                 sta     $300	;80-cols
                 ldx     #1
                 stx     $301	;lowercase
+                stx     $305	;warn about missing .sav
                 dex
                 dex
                 stx     $302	;no load
@@ -498,6 +500,8 @@ brand           jsr     $dbda
                 ldx     #<brandtext
                 ldy     #(brandtext_e-brandtext)
                 jsr     $dbda
+                lda     $305
+                beq     +
                 lda     $300
                 cmp     #$38
                 bne     +
diff --git a/src/onbeyond/z5/z5.s b/src/onbeyond/z5/z5.s
index 602f18f..5f28f61 100644
--- a/src/onbeyond/z5/z5.s
+++ b/src/onbeyond/z5/z5.s
@@ -327,7 +327,8 @@ slot            lda     $cfff
                 iny
                 bne     -
 
-                lda     $305
+                lda     $306
+                eor     $305
                 eor     $304
                 eor     $303
                 eor     $302
@@ -340,6 +341,7 @@ slot            lda     $cfff
                 sta     $300	;80-cols
                 ldx     #1
                 stx     $301	;lowercase
+                stx     $305	;warn about missing .sav
                 dex
                 dex
                 stx     $302	;no load
@@ -493,6 +495,8 @@ brand           jsr     $db5b
                 ldx     #<brandtext
                 ldy     #(brandtext_e-brandtext)
                 jsr     $db5b
+                lda     $305
+                beq     +
                 lda     $300
                 cmp     #$38
                 bne     +
diff --git a/src/onbeyond/z5u/z5u.s b/src/onbeyond/z5u/z5u.s
index 252be32..bb08318 100644
--- a/src/onbeyond/z5u/z5u.s
+++ b/src/onbeyond/z5u/z5u.s
@@ -327,7 +327,8 @@ slot            lda     $cfff
                 iny
                 bne     -
 
-                lda     $305
+                lda     $306
+                eor     $305
                 eor     $304
                 eor     $303
                 eor     $302
@@ -340,6 +341,7 @@ slot            lda     $cfff
                 sta     $300	;80-cols
                 ldx     #1
                 stx     $301	;lowercase
+                stx     $305	;warn about missing .sav
                 dex
                 dex
                 stx     $302	;no load
@@ -461,12 +463,30 @@ brand           jsr     $db53
                 lda     #>brandtext
                 ldx     #<brandtext
                 ldy     #(brandtext_e-brandtext)
-                jmp     $db53
+                jsr     $db53
+                lda     $305
+                beq     +
+                lda     $300
+                cmp     #$38
+                bne     +
+                dec     $25
+                lda     #0
+                sta     $24
+                sta     $57b
+                jsr     $8a9
+                lda     #>nosave
+                ldx     #<nosave
+                ldy     #(nosave_e-nosave)
+                jsr     $db53
++               rts
 
 brandtext       !text   "On Beyond Z-Machine! revision "
                 +version
 brandtext_e
 
+nosave          !text   "No .sav file, saving disabled"
+nosave_e
+
 !if load_aux = 1 {
                 sta     CLRAUXWR + (load_banked * 4) ;CLRAUXWR or CLRAUXZP
 } ;load_aux