diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index 748002497..db4a1e235 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -1097,10 +1097,8 @@ var ClientFormView = Backbone.View.extend({
         
         this.$('.nyi').clickover({
         	placement: 'right', 
-        	title: 'Not Yet Implemented', 
-        	content: 'The value of this field will be saved with the client, '
-        		+'but the server does not currently process anything with it. '
-        		+'Future versions of the server library will make use of this.'
+        	title: $.t('common.not-yet-implemented'),
+        	content: $.t('common.not-yet-implemented-content')
         	});
         
         $(this.el).i18n();
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
index 9702ef471..1cca37ad2 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
@@ -521,10 +521,8 @@ var DynRegEditView = Backbone.View.extend({
         
         this.$('.nyi').clickover({
         	placement: 'right', 
-        	title: 'Not Yet Implemented', 
-        	content: 'The value of this field will be saved with the client, '
-        		+'but the server does not currently process anything with it. '
-        		+'Future versions of the server library will make use of this.'
+            title: $.t('common.not-yet-implemented'),
+            content: $.t('common.not-yet-implemented-content')
         	});
         
 
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
index abfea04b0..32921c949 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
@@ -202,6 +202,8 @@
         "expires": "Expires:",
         "information": "Information",
         "new": "New",
+        "not-yet-implemented": "Not Yet Implemented",
+        "not-yet-implemented-content": "The value of this field will be saved with the client, but the server does not currently process anything with it. Future versions of the server library will make use of this.",
         "revoke": "Revoke",
         "save": "Save",
         "scopes": "Scopes",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
index 8dcf878cb..3d06ab9df 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
@@ -204,6 +204,8 @@
         "expires": "Går ut:",
         "information": "Information",
         "new": "Ny",
+        "not-yet-implemented": "Ännu inte implementerad",
+        "not-yet-implemented-content": "Värdet i detta fält kommer att sparas i databasen, men servern gör för närvarande ingenting med det. Framtida versioner av server-biblioteket kommer att använda detta fält.",
         "refresh": "Uppdatera",
         "revoke": "Återkalla",
         "save": "Spara",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
index 8e275b772..e5b8ec753 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
@@ -423,10 +423,8 @@ var ResRegEditView = Backbone.View.extend({
         
         this.$('.nyi').clickover({
         	placement: 'right', 
-        	title: 'Not Yet Implemented', 
-        	content: 'The value of this field will be saved with the client, '
-        		+'but the server does not currently process anything with it. '
-        		+'Future versions of the server library will make use of this.'
+            title: $.t('common.not-yet-implemented'),
+            content: $.t('common.not-yet-implemented-content')
         	});