diff --git a/extensions/guacamole-auth-radius/src/main/resources/config/radiusConfig.js b/extensions/guacamole-auth-radius/src/main/resources/config/radiusConfig.js
index c0154ac32..20ba86cd3 100644
--- a/extensions/guacamole-auth-radius/src/main/resources/config/radiusConfig.js
+++ b/extensions/guacamole-auth-radius/src/main/resources/config/radiusConfig.js
@@ -34,7 +34,7 @@ angular.module('guacRadius').config(['formServiceProvider',
     formServiceProvider.registerFieldType('GUAC_RADIUS_STATE', {
         module      : 'guacRadius',
         controller  : 'radiusStateController',
-        template    : '<input type=hidden ng-model="model" />'
+        template    : '<input class="ng-hide" type=hidden ng-model="model" />'
     });
 
 }]);
diff --git a/extensions/guacamole-auth-radius/src/main/resources/controllers/radiusResponseController.js b/extensions/guacamole-auth-radius/src/main/resources/controllers/radiusResponseController.js
index 17acc5797..fb16e6a63 100644
--- a/extensions/guacamole-auth-radius/src/main/resources/controllers/radiusResponseController.js
+++ b/extensions/guacamole-auth-radius/src/main/resources/controllers/radiusResponseController.js
@@ -25,10 +25,7 @@
 angular.module('guacRadius').controller('radiusResponseController', ['$scope', '$element',
         function radiusResponseController($scope, $element) {
 
-    // Find the area to display the challenge message
-    var radiusChallenge = $element.find(document.querySelector('#radius-challenge-text'));
-
     // Populate the reply message field
-    radiusChallenge.html($scope.field.replyMsg);
+    $scope.radiusPlaceholder = $scope.field.replyMsg;
 
 }]);
diff --git a/extensions/guacamole-auth-radius/src/main/resources/templates/radiusResponseField.html b/extensions/guacamole-auth-radius/src/main/resources/templates/radiusResponseField.html
index a75f66dae..eec760ff4 100644
--- a/extensions/guacamole-auth-radius/src/main/resources/templates/radiusResponseField.html
+++ b/extensions/guacamole-auth-radius/src/main/resources/templates/radiusResponseField.html
@@ -1,5 +1 @@
-<div id="radius-challenge-text" />
-<div class="password-field">
-    <input type="{{passwordInputType}}" ng-model="model" ng-trim="false" autocorrect="off" autocapitalize="off"/>
-    <div class="icon toggle-password" ng-click="togglePassword()" title="{{getTogglePasswordHelpText() | translate}}"></div>
-</div>
+<input type="password" ng-model="model" ng-trim="false" autocorrect="off" autocapitalize="off" placeholder="{{radiusPlaceholder}}" />
diff --git a/extensions/guacamole-auth-radius/src/main/resources/translations/en.json b/extensions/guacamole-auth-radius/src/main/resources/translations/en.json
index 4e61f2ced..2459b8b37 100644
--- a/extensions/guacamole-auth-radius/src/main/resources/translations/en.json
+++ b/extensions/guacamole-auth-radius/src/main/resources/translations/en.json
@@ -5,10 +5,11 @@
     },
 
     "LOGIN" : {
-        "FIELD_HEADER_RADIUS_RESPONSE"       : "",
-        "INFO_RADIUS_RESPONSE_INCORRECT"     : "RADIUS response incorrect.",
-        "INFO_RADIUS_AUTH_REQUIRED"          : "Please authenticate with RADIUS to continue.",
-        "INFO_RADIUS_ADDL_REQUIRED"          : "Additional credentials required."
+        "FIELD_HEADER_GUAC_RADIUS_CHALLENGE_RESPONSE" : "",
+        "FIELD_HEADER_GUAC_RADIUS_STATE"              : "",
+        "INFO_RADIUS_RESPONSE_INCORRECT"              : "RADIUS response incorrect.",
+        "INFO_RADIUS_AUTH_REQUIRED"                   : "Please authenticate with RADIUS to continue.",
+        "INFO_RADIUS_ADDL_REQUIRED"                   : "Please supply additional credentials"
     }
 
 }