diff --git a/algo b/algo
index d82bad8..3364e7e 100755
--- a/algo
+++ b/algo
@@ -7,13 +7,13 @@ SKIP_TAGS="_null encrypted"
 additional_roles () {
 
 read -p "
-Do you want to enable VPN Always-On when connected to cellular networks?
+Do you want to enable VPN On Demand when connected to cellular networks?
 [y/N]: " -r OnDemandEnabled_Cellular
 OnDemandEnabled_Cellular=${OnDemandEnabled_Cellular:-n}
 if [[ "$OnDemandEnabled_Cellular" =~ ^(y|Y)$ ]]; then EXTRA_VARS+=" OnDemandEnabled_Cellular=Y"; fi
 
 read -p "
-Do you want to enable VPN Always-On when connected to Wi-Fi?
+Do you want to enable VPN On Demand when connected to Wi-Fi?
 [y/N]: " -r OnDemandEnabled_WIFI
 OnDemandEnabled_WIFI=${OnDemandEnabled_WIFI:-n}
 if [[ "$OnDemandEnabled_WIFI" =~ ^(y|Y)$ ]]; then EXTRA_VARS+=" OnDemandEnabled_WIFI=Y"; fi
diff --git a/roles/vpn/templates/mobileconfig.j2 b/roles/vpn/templates/mobileconfig.j2
index 9ee20c4..c48bc1b 100644
--- a/roles/vpn/templates/mobileconfig.j2
+++ b/roles/vpn/templates/mobileconfig.j2
@@ -62,14 +62,14 @@
                     <key>IntegrityAlgorithm</key>
                     <string>SHA2-256</string>
                     <key>LifeTimeInMinutes</key>
-                    <integer>1440</integer>
+                    <integer>20</integer>
                 </dict>
                 <key>DeadPeerDetectionRate</key>
                 <string>Medium</string>
                 <key>DisableMOBIKE</key>
                 <integer>0</integer>
                 <key>DisableRedirect</key>
-                <integer>0</integer>
+                <integer>1</integer>
                 <key>EnableCertificateRevocationCheck</key>
                 <integer>0</integer>
                 <key>EnablePFS</key>
@@ -83,7 +83,7 @@
                     <key>IntegrityAlgorithm</key>
                     <string>SHA2-256</string>
                     <key>LifeTimeInMinutes</key>
-                    <integer>1440</integer>
+                    <integer>20</integer>
                 </dict>
                 <key>LocalIdentifier</key>
                 <string>{{ item.0 }}</string>
@@ -96,7 +96,7 @@
                 <string>ECDSA256</string>
 {% endif %}
                 <key>ServerCertificateIssuerCommonName</key>
-                <string>{{ IP_subject_alt_name }}</string>                
+                <string>{{ IP_subject_alt_name }}</string>
                 <key>RemoteAddress</key>
                 <string>{{ IP_subject_alt_name }}</string>
                 <key>RemoteIdentifier</key>