diff --git a/src/translation/en.json b/src/translation/en.json
index 33504f651..86406fbd5 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -649,7 +649,8 @@
             "server": "Server address",
             "username": "Username",
             "usernameNotSet": "Not set",
-            "configureAction": "Configure Registry"
+            "configureAction": "Configure Registry",
+            "serverNotSet": "Not set"
         },
         "privateDockerRegistryDialog": {
             "title": "Private Registry Configuration",
@@ -679,7 +680,9 @@
             "description": "The default language of this Cloudron can be set here. This will be used also for transactional emails like user invitation and password reset. Each user can still change the preferred language for the dashboard individually in the profile."
         },
         "registryConfig": {
-            "provider": "Docker Registry Provider"
+            "provider": "Docker Registry Provider",
+            "providerOther": "Other",
+            "providerDisabled": "Disabled"
         }
     },
     "support": {
diff --git a/src/views/settings.html b/src/views/settings.html
index e5e9623e3..393f5de2e 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -324,7 +324,7 @@
         <span class="text-muted">{{ 'settings.privateDockerRegistry.server' | tr }}</span>
       </div>
       <div class="col-xs-6 text-right">
-        <span>{{ registryConfig.currentConfig.serverAddress || 'Not set' }}</span>
+        <span>{{ registryConfig.currentConfig.serverAddress || ('settings.privateDockerRegistry.serverNotSet' | tr) }}</span>
       </div>
     </div>
 
diff --git a/src/views/settings.js b/src/views/settings.js
index df5782cfc..bd6e043a5 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -40,12 +40,17 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         { name: 'DockerHub', value: 'dockerhub' },
         { name: 'Google Cloud', value: 'google-cloud' },
         { name: 'Linode', value: 'linode' },
-        { name: 'Other', value: 'other' },
         { name: 'Quay', value: 'quay' },
         { name: 'Treescale', value: 'treescale' },
+        { name: 'Other', value: 'other' },
         { name: 'Disabled', value: 'noop' }
     ];
 
+    $translate(['settings.registryConfig.providerOther', 'settings.registryConfig.providerDisabled']).then(function (tr) {
+        if (tr['settings.registryConfig.providerOther']) $scope.registryConfigProviders.find(function (p) { return p.value === 'other'; }).name = tr['settings.registryConfig.providerOther'];
+        if (tr['settings.registryConfig.providerDisabled']) $scope.registryConfigProviders.find(function (p) { return p.value === 'noop'; }).name = tr['settings.registryConfig.providerDisabled'];
+    });
+
     $scope.openSubscriptionSetup = function () {
         Client.openSubscriptionSetup($scope.subscription || {});
     };