diff --git a/client/src/com/mirth/connect/client/ui/FirstLoginDialog.java b/client/src/com/mirth/connect/client/ui/FirstLoginDialog.java
index 22272409e..c321e0cdd 100644
--- a/client/src/com/mirth/connect/client/ui/FirstLoginDialog.java
+++ b/client/src/com/mirth/connect/client/ui/FirstLoginDialog.java
@@ -47,7 +47,7 @@ public FirstLoginDialog(User currentUser) {
         finishButton.setEnabled(false);
 
         userEditPanel.setUser(this, currentUser);
-        userEditPanel.setRequiredFields(true, true);
+        userEditPanel.setRequiredFields(false, true);
         if (currentUser.getId() == 1) {
             registerCheckBox.setVisible(false);
         }
@@ -316,7 +316,7 @@ private void registerCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//
         	userConsentCheckBox.setSelected(false);
         	userConsentCheckBox.setEnabled(false);
         }
-        userEditPanel.setRequiredFields(allRequired, true);
+        userEditPanel.setRequiredFields(false, true);
     }//GEN-LAST:event_registerCheckBoxActionPerformed
     
     public boolean getResult() {