diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index f5d0d450..b9e723df 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -492,7 +492,7 @@ def checkupdates_app(app):
             logging.warning("Can't auto-update app with no CurrentVersionCode: " + app.id)
         elif mode in ('None', 'Static'):
             pass
-        elif mode.startswith('Version '):
+        elif mode.startswith('Version'):
             pattern = mode[8:]
             suffix = ''
             if pattern.startswith('+'):
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 2d719c8a..8b27c991 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -448,7 +448,7 @@ valuetypes = {
                    ["AntiFeatures"]),
 
     FieldValidator("Auto Update Mode",
-                   r"^(Version .+|None)$",
+                   r"^(Version.*|None)$",
                    ["AutoUpdateMode"]),
 
     FieldValidator("Update Check Mode",