Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java	(revision 316176)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java	(working copy)
@@ -2082,23 +2082,32 @@ public class DeliveryBean
     log.debug("**** setting username=" + getSettings().getUsername());
     log.debug("**** setting password=" + getSettings().getPassword());
     
-    if (password == null || username == null)
+    if (password == null && username == null)
     {
     	return "passwordAccessError";
     }
-    if (password.equals(getSettings().getPassword()) &&
-        username.equals(getSettings().getUsername()))
+    if(!getSettings().getUsername().equals(""))
     {
-      // in post 2.1, clicking at Begin Assessment takes users to the
-      // 1st question.
-      return "takeAssessment";
+	    if (username != null && !username.equals(getSettings().getUsername()))
+	    {
+	    	return "passwordAccessError";
     }
-    else
+    }
+    if(!getSettings().getPassword().equals(""))
     {
+    	if (password != null && !password.equals(getSettings().getPassword()))
+    	{
     	return "passwordAccessError";
     }
   }
 
+	// in post 2.1, clicking at Begin Assessment takes users to the
+	// 1st question.
+	return "takeAssessment";
+
+  }
+
+
   public String validateIP()
   {
     String thisIp = ( (javax.servlet.http.HttpServletRequest) FacesContext.
@@ -2135,7 +2144,7 @@ public class DeliveryBean
       EventLogData eventLogData = new EventLogData();
       
       // #1. check password
-      if (!getSettings().getUsername().equals(""))
+      if (!getSettings().getUsername().equals("") || !getSettings().getPassword().equals(""))
       {
         results = validatePassword();
         log.debug("*** checked password="+results);
Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/SettingsDeliveryBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/SettingsDeliveryBean.java	(revision 316176)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/SettingsDeliveryBean.java	(working copy)
@@ -152,6 +152,8 @@ public class SettingsDeliveryBean implements Seria
    */
   public String getPassword()
   {
+    if (password == null)
+        return "";	  
     return password;
   }
 
Index: samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp	(revision 316176)
+++ samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp	(working copy)
@@ -204,8 +204,8 @@ function checkSubmit(){
     <h:outputLabel for="baUserName"  value="#{deliveryMessages.username}" rendered="#{delivery.settings.username ne ''}" />
     <h:inputText id="baUserName" value="#{delivery.username}" size="20" rendered="#{delivery.settings.username ne ''}" />
 
-    <h:outputLabel for="baPassword" value="#{deliveryMessages.password}" rendered="#{delivery.settings.username ne ''}" />
-    <h:inputSecret id="baPassword" value="#{delivery.password}" size="20" rendered="#{delivery.settings.username ne ''}" />
+    <h:outputLabel for="baPassword" value="#{deliveryMessages.password}" rendered="#{delivery.settings.password ne ''}" />
+    <h:inputSecret id="baPassword" value="#{delivery.password}" size="20" rendered="#{delivery.settings.password ne ''}" />
 </h:panelGrid>
 
  </div></div>