diff --git a/src/index.html b/src/index.html
index 01191401a..05861437a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -147,7 +147,7 @@
                   <ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
                     <li ng-show="user.isAtLeastOwner && (subscription.plan.id === 'free' || subscription.plan.id === 'expired')">
                       <a ng-click="openSubscriptionSetup()" style="cursor: pointer">
-                        <span class="badge badge-success">{{ subscription.plan.id === 'free' ? 'Setup' : 'Reactivate' }} Subscription</span>
+                        <span class="badge badge-success">{{ subscription.plan.id === 'free' ? 'Set up' : 'Reactivate' }} Subscription</span>
                       </a>
                     </li>
                     <li>
diff --git a/src/setup.html b/src/setup.html
index 53c268eaa..1ab5dc7e3 100644
--- a/src/setup.html
+++ b/src/setup.html
@@ -60,7 +60,7 @@
             <div class="row">
               <div class="col-md-12 text-center">
                 <h1>Welcome to Cloudron</h1>
-                <h3>Setup Admin Account</h3>
+                <h3>Set up Admin Account</h3>
                 <p class="has-error text-center" ng-show="owner.error.generic">{{ owner.error.generic }}</p>
               </div>
             </div>
diff --git a/src/setupdns.html b/src/setupdns.html
index edea75137..15a78160f 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -213,12 +213,12 @@
 
                                 <!-- Wildcard -->
                                 <p class="small text-info" ng-show="dnsCredentials.provider === 'wildcard'">
-                                    <span>Setup A records for <b>*.{{ dnsCredentials.domain || 'example.com' }}</b> and <b>{{ dnsCredentials.domain || 'example.com' }}</b> to this server's IP.</span>
+                                    <span>Set up A records for <b>*.{{ dnsCredentials.domain || 'example.com' }}.</b> and <b>{{ dnsCredentials.domain || 'example.com' }}.</b> to this server's IP.</span>
                                 </p>
 
                                 <!-- Manual -->
                                 <p class="small text-info" ng-show="dnsCredentials.provider === 'manual'">
-                                    <span>Setup an A record for <b>my.{{ dnsCredentials.domain || 'example.com' }}</b> to this server's IP.<br/></span>
+                                    <span>Set up an A record for <b>my.{{ dnsCredentials.domain || 'example.com' }}.</b> to this server's IP.<br/></span>
                                 </p>
 
                                 <p class="small text-info" ng-show="needsPort80(dnsCredentials.provider, dnsCredentials.tlsConfig.provider)">Let's Encrypt requires your server to be reachable on port 80</p>
diff --git a/src/translation/en.json b/src/translation/en.json
index 2295aed3d..71d95ad8b 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -123,7 +123,7 @@
             "lowOnResources": "This Cloudron is running low on resources.",
             "pleaseUpgradeServer": "Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.",
             "subscriptionRequired": "To install more apps, a paid subscription is required.",
-            "setupSubscriptionAction": "Setup Subscription",
+            "setupSubscriptionAction": "Set up Subscription",
             "installAnywayAction": "Install anyway",
             "installAction": "Install",
             "doInstallAction": "Install {{ dnsOverwrite ? 'and overwrite DNS' : '' }}"
@@ -178,16 +178,16 @@
         "settings": {
             "title": "Settings",
             "allowProfileEditCheckbox": "Allow users to edit their name and email",
-            "require2FACheckbox": "Require users to setup 2FA",
+            "require2FACheckbox": "Require users to set up 2FA",
             "subscriptionRequired": "These features are only available in the paid plans.",
-            "subscriptionRequiredAction": "Setup Subscription Now",
+            "subscriptionRequiredAction": "Set up Subscription Now",
             "saveAction": "Save"
         },
         "externalLdap": {
             "title": "LDAP",
             "description": "Cloudron will synchronize users and groups from an external LDAP or ActiveDirectory server. Password verification for authenticating those users is done against the external server. The synchronization is not run automatically but needs to be triggered manually.",
             "subscriptionRequired": "This feature is only available in the paid plans.",
-            "subscriptionRequiredAction": "Setup Subscription Now",
+            "subscriptionRequiredAction": "Set up Subscription Now",
             "noopInfo": "LDAP authentication is not configured.",
             "provider": "Provider",
             "server": "Server URL",
@@ -212,7 +212,7 @@
         },
         "subscriptionDialog": {
             "title": "Subscription required",
-            "setupAction": "Setup Subscription"
+            "setupAction": "Set up Subscription"
         },
         "addUserDialog": {
             "title": "Add User",
@@ -323,7 +323,7 @@
             "authenticatorAppDescription": "Use Google Authenticator (<a href=\"{{ googleAuthenticatorPlayStoreLink }}\" target=\"_blank\">Android</a>, <a href=\"{{ googleAuthenticatorITunesLink }}\" target=\"_blank\">iOS</a>), FreeOTP authenticator (<a href=\"{{ freeOTPPlayStoreLink }}\" target=\"_blank\">Android</a>, <a href=\"{{ freeOTPITunesLink }}\" target=\"_blank\">iOS</a>) or a similar TOTP app to scan the secret.",
             "token": "Token",
             "enable": "Enable",
-            "setup2FA": "Setup Two-Factor"
+            "setup2FA": "Set up Two-Factor"
         },
         "appPasswords": {
             "title": "App Passwords",
@@ -451,7 +451,7 @@
             "provider": "Storage provider",
             "noopNote": "This option breaks the backup and restore functionality of Cloudron and should only be used for testing. Please make sure the server is completely backed up using alternate means.",
             "mountPoint": "Mount point",
-            "mountPointDescription": "The mount point has to be setup manually. See <a href=\"{{ providerDocsLink }}\" target=\"_blank\">docs</a>.",
+            "mountPointDescription": "The mount point has to be set up manually. See <a href=\"{{ providerDocsLink }}\" target=\"_blank\">docs</a>.",
             "localDirectory": "Local backup directory",
             "ext4Label": "Backup directory is an external EXT4 Disk",
             "hardlinksLabel": "Use hardlinks",
@@ -496,7 +496,7 @@
             "title": "Footer",
             "description": "Use markdown to style the footer.",
             "subscriptionRequired": "Customizing the footer is only available in the paid plans.",
-            "setupSubscriptionNow": "Setup Subscription Now"
+            "setupSubscriptionNow": "Set up Subscription Now"
         },
         "changeLogo": {
             "title": "Choose Cloudron Avatar"
@@ -642,12 +642,12 @@
         "appstoreAccount": {
             "title": "Cloudron.io Account",
             "description": "A Cloudron.io account is used to access the App Store and manage your subscription.",
-            "setupAction": "Setup Account",
+            "setupAction": "Set up Account",
             "email": "Account Email",
             "subscription": "Subscription",
             "cloudronId": "Cloudron ID",
             "subscriptionEndsAt": "Canceled and ends on",
-            "subscriptionSetupAction": "Setup Subscription",
+            "subscriptionSetupAction": "Set up Subscription",
             "subscriptionChangeAction": "Change Subscription",
             "subscriptionReactivateAction": "Reactivate Subscription"
         },
@@ -670,7 +670,7 @@
             "title": "Private Docker Registry",
             "description": "Cloudron can pull and install <a href=\"{{ customAppsLink }}\" target=\"_blank\">custom apps</a> from a private docker registry.",
             "subscriptionRequired": "This feature is only available in the paid plans.",
-            "setupSubscriptionAction": "Setup Subscription Now",
+            "setupSubscriptionAction": "Set up Subscription Now",
             "server": "Server address",
             "username": "Username",
             "usernameNotSet": "Not set",
@@ -788,8 +788,8 @@
         },
         "subscriptionRequired": {
             "title": "Subscription required",
-            "description": "To add more domains, please setup a paid plan.",
-            "setupAction": "Setup Subscription"
+            "description": "To add more domains, please set up a paid plan.",
+            "setupAction": "Set up Subscription"
         },
         "domainDialog": {
             "addTitle": "Add Domain",
@@ -814,8 +814,8 @@
             "namecheapUsername": "Namecheap Username",
             "namecheapApiKey": "API Key",
             "namecheapInfo": "The server IP needs to be allowlisted for this API Key.",
-            "manualInfo": "All DNS records have to be setup manually before each app installation.",
-            "wildcardInfo": "Setup <i>A</i> records for <b>*.{{ domain }}</b> and <b>{{ domain }}</b> to this server's IP.",
+            "manualInfo": "All DNS records have to be set up manually before each app installation.",
+            "wildcardInfo": "Set up <i>A</i> records for <b>*.{{ domain }}.</b> and <b>{{ domain }}.</b> to this server's IP.",
             "letsEncryptInfo": "Let's Encrypt requires your server to be reachable on port 80",
             "advancedAction": "Advanced settings…",
             "zoneName": "Zone Name (Optional)",
@@ -1005,7 +1005,7 @@
             "catchall": {
                 "title": "Catch-all",
                 "description": "Emails sent to non existing addresses will be forwarded to the following mailboxes.",
-                "subscriptionRequired": "This feature is only available in the paid plans. <a href=\"\" class=\"pull-right\" ng-click=\"openSubscriptionSetup()\">Setup Subscription Now</a>",
+                "subscriptionRequired": "This feature is only available in the paid plans. <a href=\"\" class=\"pull-right\" ng-click=\"openSubscriptionSetup()\">Set up Subscription Now</a>",
                 "saveAction": "Save"
             },
             "incomingServerInfo": "Incoming Mail (IMAP)"
@@ -1025,7 +1025,7 @@
                 "password": "Password",
                 "saveSuccess": "Saved",
                 "saveAction": "Save",
-                "spfDocInfo": "Cloudron does not automatically setup SPF record. Set it up manually by following the <a href=\"{{ spfDocsLink }}\" target=\"_blank\">{{ name }} docs</a>."
+                "spfDocInfo": "Cloudron does not automatically set up SPF record. Set it up manually by following the <a href=\"{{ spfDocsLink }}\" target=\"_blank\">{{ name }} docs</a>."
             }
         },
         "settings": {
@@ -1040,7 +1040,7 @@
         "signature": {
             "title": "Signature",
             "description": "The text here will be attached to all emails going out from this domain.",
-            "subscriptionRequired": "This feature is only available in the paid plans. <a href=\"\" class=\"pull-right\" ng-click=\"openSubscriptionSetup()\">Setup Subscription Now</a>",
+            "subscriptionRequired": "This feature is only available in the paid plans. <a href=\"\" class=\"pull-right\" ng-click=\"openSubscriptionSetup()\">Set up Subscription Now</a>",
             "plainTextFormat": "Text format",
             "htmlFormat": "HTML format (Optional)",
             "saveAction": "Save"
@@ -1050,7 +1050,7 @@
         },
         "dnsStatus": {
             "title": "DNS Status",
-            "reSetupAction": "Re-setup DNS",
+            "reSetupAction": "Redo DNS setup",
             "description": "Status of DNS Records may show an error while DNS is propagating (~5 minutes). See the <a href=\"{{ emailDnsDocsLink }}\" target=\"_blank\">troubleshooting</a> docs for help.",
             "namecheapInfo": "Namecheap requires manual steps for MX records",
             "ptrInfo": "The PTR record is set by your VPS provider and not by your DNS provider.",
@@ -1071,16 +1071,16 @@
         },
         "subscriptionDialog": {
             "title": "Subscription required",
-            "description": "To add more mailboxes, please setup a paid plain.",
-            "setupAction": "Setup Subscription"
+            "description": "To add more mailboxes, please set up a paid plain.",
+            "setupAction": "Set up Subscription"
         },
         "enableEmailDialog": {
             "title": "Enable Email for {{ domain }}?",
             "description": "This will configure Cloudron to receive emails for <b>{{ domain }}</b>. See the documentation for opening up the <a href=\"{{ requiredPortsDocsLink }}\" target=\"_blank\">required ports</a> for Cloudron Email.",
-            "noProviderInfo": "No DNS provider is setup. The DNS records listed in the Status tab have to be setup manually.",
+            "noProviderInfo": "No DNS provider is set up. The DNS records listed in the Status tab have to be set up manually.",
             "cloudflareInfo": "The domain <code>{{ adminDomain }}</code> is managed by Cloudflare. Please verify that Cloudflare proxying is disabled for <code>{{ mailFqdn }}</code> and set to <code>DNS only</code>. This is required because Cloudflare does not proxy email.",
-            "setupDnsCheckbox": "Setup Mail DNS records now",
-            "setupDnsInfo": "Use this option to automatically setup Email related DNS records. Leaving this option unchecked is useful for creating mail boxes and <a href=\"{{ importEmailDocsLink }}\">importing email</a> before going live.",
+            "setupDnsCheckbox": "Set up Mail DNS records now",
+            "setupDnsInfo": "Use this option to automatically set up Email related DNS records. Leaving this option unchecked is useful for creating mail boxes and <a href=\"{{ importEmailDocsLink }}\">importing email</a> before going live.",
             "enableAction": "Enable"
         },
         "disableEmailDialog": {
@@ -1376,9 +1376,9 @@
             "title": "Update {{ app }}",
             "unstableWarning": "This update is a pre-release and not considered stable yet. Please update at your own risk.",
             "changelogHeader": "Changes for new version {{ version}}:",
-            "subscriptionExpired": "Your Cloudron subscription has expired. Please setup a subscription to update the app.",
+            "subscriptionExpired": "Your Cloudron subscription has expired. Please set up a subscription to update the app.",
             "skipBackupCheckbox": "Skip backup",
-            "setupSubscriptionAction": "Setup Subscription",
+            "setupSubscriptionAction": "Set up Subscription",
             "updateAction": "Update"
         },
         "restoreDialog": {
@@ -1436,7 +1436,7 @@
     },
     "setupAccount": {
         "welcomeTo": "Welcome to",
-        "description": "Please setup your account",
+        "description": "Please set up your account",
         "username": "Username",
         "errorUsernameTooShort": "The username is too short",
         "errorUsernameTooLong": "The username is too long",
@@ -1446,7 +1446,7 @@
         "passwordRepeat": "Repeat Password",
         "errorPassword": "Password must be at least 8 characters",
         "errorPasswordNoMatch": "Passwords don't match",
-        "setupAction": "Setup",
+        "setupAction": "Set up",
         "invalidToken": {
             "title": "Invalid or Expired Invite Link",
             "description": "Contact your server admin to get a new invite link."