diff --git a/src/translation/en.json b/src/translation/en.json
index 89e7f0f33..efa403697 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -30,9 +30,28 @@
         "primaryEmail": "Primary email",
         "passwordRecoveryEmail": "Password recovery email",
         "language": "Language",
-        "changePassword": "Change Password",
-        "disable2FA": "Disable 2FA",
-        "enable2FA": "Enable 2FA",
+        "changePassword": {
+            "title": "Change your password",
+            "currentPassword": "Current password",
+            "newPassword": "New password",
+            "newPasswordRepeat": "Repeat new password",
+            "errorPasswordRequired": "A password is required",
+            "errorPasswordsDontMatch": "Passwords don't match",
+            "errorPasswordInvalid": "Password must be at least 8 and at most 265 characters"
+        },
+        "disable2FA": {
+            "title": "Disable Two-Factor Authentication",
+            "password": "Password",
+            "disable": "Disable"
+        },
+        "enable2FA": {
+            "title": "Enable Two-Factor Authentication",
+            "description": "Your Cloudron Administrator has required all members to enable two-factor authentication. You will be unable to access the dashboard until you enable 2FA.",
+            "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"
+        },
         "appPasswords": {
             "title": "App Passwords",
             "app": "App",
@@ -55,6 +74,39 @@
             "title": "Login Tokens",
             "description": "You have {{ webadminTokens.length }} active web token(s) and {{ cliTokens.length }} CLI token(s).",
             "logoutAll": "Logout From All"
+        },
+        "changeEmail": {
+            "title": "Change primary email address",
+            "errorEmailInvalid": "The Email address is not valid",
+            "errorEmailRequired": "A valid email address is required"
+        },
+        "changeFallbackEmail": {
+            "title": "Change password recovery email address",
+            "errorEmailRequired": "A valid email address is required",
+            "errorEmailInvalid": "The Email address is not valid"
+        },
+        "changeDisplayName": {
+            "title": "Change your display name",
+            "label": "Display name",
+            "errorNameInvalid": "This display name is not valid",
+            "errorDisplayNameRequired": "A valid display name is required"
+        },
+        "createAppPassword": {
+            "title": "Create App Password",
+            "name": "Password Name",
+            "errorNameRequired": "A name is required",
+            "app": "App",
+            "description": "Use the following password to authenticate against the app:",
+            "copyNow": "Please copy the password now. It won't be shown again for security purposes.",
+            "generatePassword": "Generate Password"
+        },
+        "createApiToken": {
+            "title": "Create API Token",
+            "name": "API Token Name",
+            "errorNameRequired": "A name is required",
+            "description": "New API token:",
+            "copyNow": "Please copy the API token now. It won't be shown again for security purposes.",
+            "generateToken": "Generate API Token"
         }
     },
     "backups": {
diff --git a/src/views/profile.html b/src/views/profile.html
index d9828b56e..3dde9ed69 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -38,13 +38,13 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Change your password</h4>
+        <h4 class="modal-title">{{ 'profile.changePassword.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="passwordChangeForm" role="form" novalidate ng-submit="passwordchange.submit()" autocomplete="off">
           <input type="password" style="display: none;">
           <div class="form-group" ng-class="{ 'has-error': (!passwordChangeForm.password.$dirty && passwordchange.error.password) || (passwordChangeForm.password.$dirty && passwordChangeForm.password.$invalid) }">
-            <label class="control-label" for="inputPasswordChangePassword">Current password</label>
+            <label class="control-label" for="inputPasswordChangePassword">{{ 'profile.changePassword.currentPassword' | tr }}</label>
             <div class="control-label" ng-show="(!passwordChangeForm.password.$dirty && passwordchange.error.password) || (passwordChangeForm.password.$dirty && passwordChangeForm.password.$invalid)">
               <small ng-show="!passwordChangeForm.password.$dirty && passwordchange.error.password">Wrong password</small>
               <small ng-show="passwordChangeForm.password.$dirty && passwordChangeForm.password.$error.required">A password is required</small>
@@ -52,18 +52,18 @@
             <input type="password" class="form-control" ng-model="passwordchange.password" id="inputPasswordChangePassword" name="password" required autofocus>
           </div>
           <div class="form-group" ng-class="{ 'has-error': (!passwordChangeForm.newPassword.$dirty && passwordchange.error.newPassword) || (passwordChangeForm.newPassword.$dirty && passwordChangeForm.newPassword.$invalid) }">
-            <label class="control-label" for="inputPasswordChangeNewPassword">New password</label>
+            <label class="control-label" for="inputPasswordChangeNewPassword">{{ 'profile.changePassword.newPassword' | tr }}</label>
             <div class="control-label" ng-show="(!passwordChangeForm.newPassword.$dirty && passwordchange.error.newPassword) || (passwordChangeForm.newPassword.$dirty && passwordChangeForm.newPassword.$invalid)">
               <small ng-show="!passwordChangeForm.newPassword.$dirty && passwordchange.error.newPassword">{{ passwordchange.error.newPassword }}<br/><br/></small>
-              <small ng-show=" passwordChangeForm.newPassword.$dirty && passwordChangeForm.newPassword.$invalid">Password must be at least 8 and at most 265 characters</small>
+              <small ng-show=" passwordChangeForm.newPassword.$dirty && passwordChangeForm.newPassword.$invalid">{{ 'profile.changePassword.errorPasswordInvalid' | tr }}</small>
             </div>
             <input type="password" class="form-control" ng-model="passwordchange.newPassword" id="inputPasswordChangeNewPassword" name="newPassword" ng-minlength="8" ng-maxlength="256" required autofocus>
           </div>
           <div class="form-group" ng-class="{ 'has-error': (!passwordChangeForm.newPassword.$dirty && passwordchange.error.newPassword) || (passwordChangeForm.newPasswordRepeat.$dirty && passwordChangeForm.newPasswordRepeat.$error.required) || (passwordChangeForm.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat) }">
-            <label class="control-label" for="inputPasswordChangeNewPasswordRepeat">Repeat new password</label>
+            <label class="control-label" for="inputPasswordChangeNewPasswordRepeat">{{ 'profile.changePassword.newPasswordRepeat' | tr }}</label>
             <div class="control-label" ng-show="(!passwordChangeForm.newPassword.$dirty && passwordchange.error.newPassword) || (passwordChangeForm.newPasswordRepeat.$dirty && passwordChangeForm.newPasswordRepeat.$error.required) || (passwordChangeForm.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat)">
-              <small ng-show="passwordChangeForm.newPasswordRepeat.$dirty && passwordChangeForm.newPasswordRepeat.$error.required">A password is required</small>
-              <small ng-show="passwordChangeForm.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat && passwordchange.newPasswordRepeat">Passwords don't match</small>
+              <small ng-show="passwordChangeForm.newPasswordRepeat.$dirty && passwordChangeForm.newPasswordRepeat.$error.required">{{ 'profile.changePassword.errorPasswordRequired' | tr }}</small>
+              <small ng-show="passwordChangeForm.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat && passwordchange.newPasswordRepeat">{{ 'profile.changePassword.errorPasswordsDontMatch' | tr }}</small>
             </div>
             <input type="password" class="form-control" ng-model="passwordchange.newPasswordRepeat" id="inputPasswordChangeNewPasswordRepeat" name="newPasswordRepeat" required autofocus>
           </div>
@@ -72,7 +72,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="passwordchange.submit()" ng-disabled="passwordChangeForm.$invalid || passwordchange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordchange.busy"></i> Change</button>
+        <button type="button" class="btn btn-success" ng-click="passwordchange.submit()" ng-disabled="passwordChangeForm.$invalid || passwordchange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="passwordchange.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
     </div>
   </div>
@@ -83,14 +83,14 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Change primary email address</h4>
+        <h4 class="modal-title">{{ 'profile.changeEmail.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="emailChangeForm" role="form" novalidate ng-submit="emailchange.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (emailChangeForm.email.$dirty && emailChangeForm.email.$invalid) || (!emailChangeForm.email.$dirty && emailchange.error.email)}">
             <div class="control-label" ng-show="(!emailChangeForm.email.$dirty && emailchange.error.email) || (emailChangeForm.email.$dirty && emailChangeForm.email.$invalid)">
-              <small ng-show="emailChangeForm.email.$error.required">A valid email address is required</small>
-              <small ng-show="(emailChangeForm.email.$dirty && emailChangeForm.email.$invalid) && !emailChangeForm.email.$error.required">The Email address is not valid</small>
+              <small ng-show="emailChangeForm.email.$error.required">{{ 'profile.changeEmail.errorEmailRequired' | tr }}</small>
+              <small ng-show="(emailChangeForm.email.$dirty && emailChangeForm.email.$invalid) && !emailChangeForm.email.$error.required">{{ 'profile.changeEmail.errorEmailInvalid' | tr }}</small>
               <small ng-show="!emailChangeForm.email.$dirty && emailchange.error.email">{{ emailchange.error.email }}</small>
             </div>
             <input type="email" class="form-control" ng-model="emailchange.email" id="inputEmailChangeEmail" name="email" required autofocus>
@@ -100,7 +100,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="emailchange.submit()" ng-disabled="emailChangeForm.$invalid || emailchange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="emailchange.busy"></i> Change</button>
+        <button type="button" class="btn btn-success" ng-click="emailchange.submit()" ng-disabled="emailChangeForm.$invalid || emailchange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="emailchange.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
     </div>
   </div>
@@ -111,14 +111,14 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Change password recovery email address</h4>
+        <h4 class="modal-title">{{ 'profile.changeFallbackEmail.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="fallbackEmailChangeForm" role="form" novalidate ng-submit="fallbackEmailChange.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid) || (!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email)}">
             <div class="control-label" ng-show="(!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email) || (fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid)">
-              <small ng-show="fallbackEmailChangeForm.email.$error.required">A valid email address is required</small>
-              <small ng-show="(fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid) && !fallbackEmailChangeForm.email.$error.required">The Email address is not valid</small>
+              <small ng-show="fallbackEmailChangeForm.email.$error.required">{{ 'profile.changeFallbackEmail.errorEmailRequired' | tr }}</small>
+              <small ng-show="(fallbackEmailChangeForm.email.$dirty && fallbackEmailChangeForm.email.$invalid) && !fallbackEmailChangeForm.email.$error.required">{{ 'profile.changeFallbackEmail.errorEmailInvalid' | tr }}</small>
               <small ng-show="!fallbackEmailChangeForm.email.$dirty && fallbackEmailChange.error.email">{{ fallbackEmailChange.error.email }}</small>
             </div>
             <input type="email" class="form-control" ng-model="fallbackEmailChange.email" id="inputfallbackEmailChangeEmail" name="email" required autofocus>
@@ -128,7 +128,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="fallbackEmailChange.submit()" ng-disabled="fallbackEmailChangeForm.$invalid || fallbackEmailChange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="fallbackEmailChange.busy"></i> Change</button>
+        <button type="button" class="btn btn-success" ng-click="fallbackEmailChange.submit()" ng-disabled="fallbackEmailChangeForm.$invalid || fallbackEmailChange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="fallbackEmailChange.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
     </div>
   </div>
@@ -139,15 +139,15 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Change your display name</h4>
+        <h4 class="modal-title">{{ 'profile.changeDisplayName.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="displayNameChangeForm" role="form" novalidate ng-submit="displayNameChange.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (displayNameChangeForm.displayName.$dirty && displayNameChangeForm.displayName.$invalid) || (!displayNameChangeForm.displayName.$dirty && displayNameChange.error.displayName)}">
-            <label class="control-label">Display name</label>
+            <label class="control-label">{{ 'profile.changeDisplayName.label' | tr }}</label>
             <div class="control-label" ng-show="(!displayNameChangeForm.displayName.$dirty && displayNameChange.error.displayName) || (displayNameChangeForm.displayName.$dirty && displayNameChangeForm.displayName.$invalid)">
-              <small ng-show="displayNameChangeForm.displayName.$error.required">A valid display name is required</small>
-              <small ng-show="(displayNameChangeForm.displayName.$dirty && displayNameChangeForm.displayName.$invalid) && !displayNameChangeForm.displayName.$error.required">This display name is not valid</small>
+              <small ng-show="displayNameChangeForm.displayName.$error.required">{{ 'profile.changeDisplayName.errorDisplayNameRequired' | tr }}</small>
+              <small ng-show="(displayNameChangeForm.displayName.$dirty && displayNameChangeForm.displayName.$invalid) && !displayNameChangeForm.displayName.$error.required">{{ 'profile.changeDisplayName.errorNameInvalid' | tr }}</small>
               <small ng-show="!displayNameChangeForm.email.$dirty && displayNameChange.error.displayName">{{ displayNameChange.error.displayName }}</small>
             </div>
             <input type="text" class="form-control" ng-model="displayNameChange.displayName" id="inputDisplayNameChangeDisplayName" name="displayName" required autofocus>
@@ -157,7 +157,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="displayNameChange.submit()" ng-disabled="displayNameChangeForm.$invalid || displayNameChange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="displayNameChange.busy"></i> Change</button>
+        <button type="button" class="btn btn-success" ng-click="displayNameChange.submit()" ng-disabled="displayNameChangeForm.$invalid || displayNameChange.busy"><i class="fa fa-circle-notch fa-spin" ng-show="displayNameChange.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
     </div>
   </div>
@@ -168,19 +168,14 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Enable Two-Factor Authentication</h4>
+        <h4 class="modal-title">{{ 'profile.enable2FA.title' | tr }}</h4>
       </div>
-      <p class="modal-body" ng-show="twoFactorAuthentication.mandatory2FAHelp && !twoFactorAuthentication.secret">
-        Your Cloudron Administrator has required all members to enable two-factor authentication. You will be unable to access
-        the dashboard until you enable 2FA.
-      </p>
+      <p class="modal-body" ng-show="twoFactorAuthentication.mandatory2FAHelp && !twoFactorAuthentication.secret">{{ 'profile.enable2FA.description' | tr }}</p>
       <div class="modal-body text-center" ng-show="!twoFactorAuthentication.mandatory2FAHelp && !twoFactorAuthentication.secret">
         <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
       </div>
       <div class="modal-body" ng-show="twoFactorAuthentication.secret">
-         <p>
-            Use Google Authenticator (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605" target="_blank">iOS</a>), FreeOTP authenticator (<a href="https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp" target="_blank">Android</a>, <a href="https://itunes.apple.com/us/app/freeotp-authenticator/id872559395" target="_blank">iOS</a>) or a similar TOTP app to scan the secret.
-        </p>
+        <p ng-bind-html="'profile.enable2FA.authenticatorAppDescription' | tr:translationData"></p>
         <center>
           <img ng-src="{{ twoFactorAuthentication.qrcode }}"/>
           <p>{{ twoFactorAuthentication.secret }}</p>
@@ -188,7 +183,7 @@
         <br/>
         <form name="twoFactorAuthenticationEnableForm" role="form" novalidate ng-submit="twoFactorAuthentication.enable()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (!twoFactorAuthenticationEnableForm.totpToken.$dirty && twoFactorAuthentication.error) || (twoFactorAuthenticationEnableForm.totpToken.$dirty && twoFactorAuthenticationEnableForm.totpToken.$invalid) }">
-            <label class="control-label">Token</label>
+            <label class="control-label">{{ 'profile.enable2FA.token' | tr }}</label>
             <div class="control-label" ng-show="(!twoFactorAuthenticationEnableForm.totpToken.$dirty && twoFactorAuthentication.error) || (twoFactorAuthenticationEnableForm.totpToken.$dirty && twoFactorAuthenticationEnableForm.totpToken.$invalid)">
               <small>{{ twoFactorAuthentication.error }}</small>
             </div>
@@ -199,8 +194,8 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal" ng-if="!twoFactorAuthentication.mandatory2FA">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="twoFactorAuthentication.enable()" ng-show="twoFactorAuthentication.secret" ng-disabled="twoFactorAuthenticationEnableForm.$invalid || twoFactorAuthentication.busy"><i class="fa fa-circle-notch fa-spin" ng-show="twoFactorAuthentication.busy"></i> Enable</button>
-        <button type="button" class="btn btn-success" ng-click="twoFactorAuthentication.getSecret()" ng-show="twoFactorAuthentication.mandatory2FAHelp" >Setup Two-Factor</button>
+        <button type="button" class="btn btn-success" ng-click="twoFactorAuthentication.enable()" ng-show="twoFactorAuthentication.secret" ng-disabled="twoFactorAuthenticationEnableForm.$invalid || twoFactorAuthentication.busy"><i class="fa fa-circle-notch fa-spin" ng-show="twoFactorAuthentication.busy"></i> {{ 'profile.enable2FA.enable' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-click="twoFactorAuthentication.getSecret()" ng-show="twoFactorAuthentication.mandatory2FAHelp" >{{ 'profile.enable2FA.setup2FA' | tr }}</button>
       </div>
     </div>
   </div>
@@ -211,12 +206,12 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 class="modal-title">Disable Two-Factor Authentication</h4>
+          <h4 class="modal-title">{{ 'profile.disable2FA.title' | tr }}</h4>
         </div>
         <div class="modal-body">
           <form name="twoFactorAuthenticationDisableForm" role="form" novalidate ng-submit="twoFactorAuthentication.disable()" autocomplete="off">
             <div class="form-group" ng-class="{ 'has-error': (!twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthentication.error) || (twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthenticationDisableForm.password.$invalid) }">
-              <label class="control-label">Password</label>
+              <label class="control-label">{{ 'profile.disable2FA.password' | tr }}</label>
               <div class="control-label" ng-show="(!twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthentication.error) || (twoFactorAuthenticationDisableForm.password.$dirty && twoFactorAuthenticationDisableForm.password.$invalid)">
                 <small>{{ twoFactorAuthentication.error }}</small>
               </div>
@@ -227,7 +222,7 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-          <button type="button" class="btn btn-success" ng-click="twoFactorAuthentication.disable()" ng-disabled="twoFactorAuthenticationDisableForm.$invalid || twoFactorAuthentication.busy"><i class="fa fa-circle-notch fa-spin" ng-show="twoFactorAuthentication.busy"></i> Disable</button>
+          <button type="button" class="btn btn-success" ng-click="twoFactorAuthentication.disable()" ng-disabled="twoFactorAuthenticationDisableForm.$invalid || twoFactorAuthentication.busy"><i class="fa fa-circle-notch fa-spin" ng-show="twoFactorAuthentication.busy"></i> {{ 'profile.disable2FA.disable' | tr }}</button>
         </div>
       </div>
     </div>
@@ -238,21 +233,21 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Create App Password</h4>
+        <h4 class="modal-title">{{ 'profile.createAppPassword.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <div ng-hide="appPasswordAdd.password">
           <form name="appPasswordAddForm" role="form" novalidate ng-submit="appPasswordAdd.submit()" autocomplete="off">
             <div class="form-group" ng-class="{ 'has-error': (appPasswordAddForm.name.$dirty && appPasswordAddForm.name.$invalid) || (!appPasswordAddForm.name.$dirty && appPasswordAdd.error.name)}">
-              <label class="control-label">Password Name</label>
+              <label class="control-label">{{ 'profile.createAppPassword.name' | tr }}</label>
               <div class="control-label" ng-show="(!appPasswordAddForm.name.$dirty && appPasswordAdd.error.name) || (appPasswordAddForm.name.$dirty && appPasswordAddForm.name.$invalid)">
-                <small ng-show="appPasswordAddForm.name.$error.required">A name is required</small>
+                <small ng-show="appPasswordAddForm.name.$error.required">{{ 'profile.createAppPassword.errorNameRequired' | tr }}</small>
                 <small ng-show="appPasswordAdd.error.name">{{ appPasswordAdd.error.name }}</small>
               </div>
               <input type="text" class="form-control" ng-model="appPasswordAdd.name" id="inputAppPasswordAddName" name="name" required autofocus>
             </div>
             <div class="form-group" ng-class="{ 'has-error': (appPasswordAddForm.identifier.$dirty && appPasswordAddForm.identifier.$invalid) || (!appPasswordAddForm.identifier.$dirty && appPasswordAdd.error.identifier)}">
-              <label class="control-label">App</label>
+              <label class="control-label">{{ 'profile.createAppPassword.app' | tr }}</label>
               <select class="form-control" ng-model="appPasswordAdd.identifier" ng-options="a.id as a.label for a in appPassword.identifiers" required></select>
             </div>
             <input class="ng-hide" type="submit" ng-disabled="appPasswordAddForm.$invalid"/>
@@ -260,19 +255,18 @@
         </div>
 
         <div ng-show="appPasswordAdd.password">
-          Use the following password to authenticate against the app:
+          {{ 'profile.createAppPassword.description' | tr }}
           <br/>
           <b ng-click-select>{{ appPasswordAdd.password.password }}</b>
-
           <br/>
           <br/>
-          <p>Please copy the password now. It won't be shown again for security purposes.</p>
+          <p>{{ 'profile.createAppPassword.copyNow' | tr }}</p>
         </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
         <button type="button" class="btn btn-success" ng-click="appPasswordAdd.submit()" ng-hide="appPasswordAdd.password" ng-disabled="appPasswordAddForm.$invalid || appPasswordAdd.busy">
-          <i class="fa fa-circle-notch fa-spin" ng-show="appPasswordAdd.busy"></i> Generate Password
+          <i class="fa fa-circle-notch fa-spin" ng-show="appPasswordAdd.busy"></i> {{ 'profile.createAppPassword.generatePassword' | tr }}
         </button>
       </div>
     </div>
@@ -284,15 +278,15 @@
   <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 class="modal-title">Create API Token</h4>
+          <h4 class="modal-title">{{ 'profile.createApiToken.title' | tr }}</h4>
         </div>
         <div class="modal-body">
           <div ng-hide="tokens.add.accessToken">
             <form name="apiTokenAddForm" role="form" novalidate ng-submit="tokens.add.submit()" autocomplete="off">
               <div class="form-group" ng-class="{ 'has-error': (apiTokenAddForm.name.$dirty && apiTokenAddForm.name.$invalid) || (!apiTokenAddForm.name.$dirty && tokens.add.error)}">
-                <label class="control-label">API Token Name</label>
+                <label class="control-label">{{ 'profile.createApiToken.name' | tr }}</label>
                 <div class="control-label" ng-show="(!apiTokenAddForm.name.$dirty && tokens.add.error) || (apiTokenAddForm.name.$dirty && apiTokenAddForm.name.$invalid)">
-                  <small ng-show="apiTokenAddForm.name.$error.required">A name is required</small>
+                  <small ng-show="apiTokenAddForm.name.$error.required">{{ 'profile.createApiToken.errorNameRequired' | tr }}</small>
                   <small ng-show="tokens.add.error.name">{{ tokens.add.error }}</small>
                 </div>
                 <input type="text" class="form-control" id="inputApiTokenName" ng-model="tokens.add.name" name="name" required autofocus>
@@ -302,19 +296,19 @@
             </form>
           </div>
           <div ng-show="tokens.add.accessToken">
-            New API token:
+            {{ 'profile.createApiToken.description' | tr }}
             <br/>
             <b ng-click-select>{{ tokens.add.accessToken }}</b>
 
             <br/>
             <br/>
-            <p>Please copy the API token now. It won't be shown again for security purposes.</p>
+            <p>{{ 'profile.createApiToken.copyNow' | tr }}</p>
           </div>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
           <button type="button" class="btn btn-success" ng-click="tokens.add.submit()" ng-hide="tokens.add.accessToken" ng-disabled="apiTokenAddForm.$invalid || tokens.add.busy">
-            <i class="fa fa-circle-notch fa-spin" ng-show="tokens.add.busy"></i> Generate API Token
+            <i class="fa fa-circle-notch fa-spin" ng-show="tokens.add.busy"></i> {{ 'profile.createApiToken.generateToken' | tr }}
           </button>
         </div>
       </div>
diff --git a/src/views/profile.js b/src/views/profile.js
index 478e67077..972008426 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -11,7 +11,11 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
 
     $scope.translationData = {
         gravatarLink: 'https://gravatar.com/',
-        apiDocsLink: 'https://docs.cloudron.io/api.html'
+        apiDocsLink: 'https://docs.cloudron.io/api.html',
+        googleAuthenticatorPlayStoreLink: 'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2',
+        googleAuthenticatorITunesLink: 'https://itunes.apple.com/us/app/google-authenticator/id388497605',
+        freeOTPPlayStoreLink: 'https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp',
+        freeOTPITunesLink: 'https://itunes.apple.com/us/app/freeotp-authenticator/id872559395',
     };
 
     $scope.language;