diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css
index e62d9e6e2..440ab2c79 100644
--- a/webapp/web/css/account/account.css
+++ b/webapp/web/css/account/account.css
@@ -50,6 +50,12 @@ table#account td  a {
 table#account tr:nth-child(2n) {
     background-color: rgba(200, 200, 180,.25);
 }
+input#externalAuthChkBox {
+    height:18px;
+    width:18px;
+    margin-top:10px;
+    margin-bottom:10px;
+}
 #filter-roles {
     float: left;
     padding-bottom: 20px;
@@ -246,4 +252,4 @@ padding-right: 5px;
 	-moz-border-radius-bottomright: 5px;
 	-webkit-border-bottom-left-radius: 5px;
 	-webkit-border-bottom-right-radius: 5px;
-}
\ No newline at end of file
+}
diff --git a/webapp/web/js/account/accountExternalAuthFlag.js b/webapp/web/js/account/accountExternalAuthFlag.js
new file mode 100644
index 000000000..e6b2890fb
--- /dev/null
+++ b/webapp/web/js/account/accountExternalAuthFlag.js
@@ -0,0 +1,26 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+  
+// Change form actions in account main page
+    
+$(document).ready(function(){
+
+    // The externalAuthOnly checkbox drives the display of the password and re-set
+    // password fields. When checked, the password fields are hidden
+    $('input:checkbox[name=externalAuthOnly]').click(function(){
+         if ( this.checked ) {
+         // If checked, hide those puppies
+            $('#passwordContainer').addClass('hidden');
+            $('#pwdResetContainer').addClass('hidden');
+        // And clear any values entered in the password fields
+            $('input[name=confirmPassword]').val("");
+            $('input[name=initialPassword]').val("");
+            $('input[name=newPassword]').val("");
+         } 
+         else {
+         // if not checked, display them
+            $('#passwordContainer').removeClass('hidden');
+            $('#pwdResetContainer').removeClass('hidden');
+         }
+    });
+
+});
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index 7590d9f7c..8164f6bbc 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -64,6 +64,7 @@
 
         <#include "userAccounts-associateProfilePanel.ftl">
 
+        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if>  /><span>Externally Authenticated Only</span></p>
         <p>Roles<span class="requiredHint"> *</span></p>
         <#list roles as role>
             <input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> />
@@ -78,21 +79,23 @@
                 It will include instructions for activating the account and creating a password.
             </p>
         <#else>
-            <table>
-                <tr>
-                    <td>
-                        <label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
-                        <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
-                    </td>
-                    <td>&nbsp;</td>
-                    <td>
-                        <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
-                        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-                    </td>
-                </tr>
-            </table>
+            <div id="passwordContainer">
+                <table>
+                    <tr>
+                        <td>
+                            <label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
+                            <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
+                        </td>
+                        <td>&nbsp;</td>
+                        <td>
+                            <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
+                            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+                        </td>
+                    </tr>
+                </table>
             
-            <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
+                <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
+            </div>
         </#if>
         
         <br />
@@ -103,4 +106,6 @@
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
\ No newline at end of file
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountExternalAuthFlag.js"></script>')}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 6e959ace8..59ef14edc 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -64,6 +64,7 @@
 
         <#include "userAccounts-associateProfilePanel.ftl">
 
+        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly"  <#if externalAuthOnly?? >checked</#if>  /><span>Externally Authenticated Only</span></p>
         <#if roles?has_content>
             <p>Roles<span class="requiredHint"> *</span></p>
             <#list roles as role>
@@ -74,30 +75,34 @@
         </#if>
 
         <#if emailIsEnabled??>
-            <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
-            <label  class="inline" for="reset-password"> Reset password</label>
+            <div id="pwdResetContainer" <#if externalAuthOnly?? >class="hidden"</#if> >
+                <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
+                <label  class="inline" for="reset-password"> Reset password</label>
 
-            <p class="note">
-                Note: Instructions for resetting the password will 
-                be emailed to the address entered above. The password will not 
-                be reset until the user follows the link provided in this email.
-            </p>
+                <p class="note">
+                    Note: Instructions for resetting the password will 
+                    be emailed to the address entered above. The password will not 
+                    be reset until the user follows the link provided in this email.
+                </p>
+            </div>
         <#else>
-            <table>
-                <tr>
-                    <td>
-                        <label for="new-password">New password<span class="requiredHint"> *</span></label>
-                        <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-                    </td>
-                    <td>&nbsp;</td>
-                    <td>
-                        <label for="confirm-password">Confirm new password<span class="requiredHint"> *</span></label> 
-                        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-                    </td>
-                </tr>
-            </table>
-            <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
-            <p class="explanatoryText">Leaving this blank means that the password will not be changed.</p>
+            <div id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> >
+                <table>
+                    <tr>
+                        <td>
+                            <label for="new-password">New password<span class="requiredHint"> *</span></label>
+                            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+                        </td>
+                        <td>&nbsp;</td>
+                        <td>
+                            <label for="confirm-password">Confirm new password<span class="requiredHint"> *</span></label> 
+                            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+                        </td>
+                    </tr>
+                </table>
+                <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
+                <p class="explanatoryText">Leaving this blank means that the password will not be changed.</p>
+            </div>
         </#if>
         <br />
         <input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a>
@@ -108,3 +113,5 @@
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountExternalAuthFlag.js"></script>')}