diff --git a/src/main/java/org/olat/course/run/userview/NodeEvaluation.java b/src/main/java/org/olat/course/run/userview/NodeEvaluation.java
index 0699ebdc6171fb096c4830af734ee8688a881e7c..76835b753942e5ae9788503e41a2405b01b5c574 100644
--- a/src/main/java/org/olat/course/run/userview/NodeEvaluation.java
+++ b/src/main/java/org/olat/course/run/userview/NodeEvaluation.java
@@ -117,8 +117,10 @@ public class NodeEvaluation extends GenericNode {
 			gtn.setAltText(courseNode.getLongTitle());
 			String type = courseNode.getType();
 			CourseNodeConfiguration cnConfig = CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(type);
-			String nodeCssClass = cnConfig.getIconCSSClass();
-			gtn.setIconCssClass(nodeCssClass);
+			if(cnConfig != null) {
+				String nodeCssClass = cnConfig.getIconCSSClass();
+				gtn.setIconCssClass(nodeCssClass);
+			}
 			gtn.setUserObject(this); // the current NodeEval is set into the treenode
 																// as the userobject
 			// all treenodes added here are set to be visible/accessible, since the
diff --git a/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java b/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
index 020ab7e535bae96f80d3415ea3ed7646e40ae206..34cdb95948613bcf3736504581279875d91eef0b 100644
--- a/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
+++ b/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
@@ -87,11 +87,11 @@ public class LDAPAuthenticationController extends AuthenticationController imple
 		
 		if(UserModule.isPwdchangeallowed(null) && LDAPLoginModule.isPropagatePasswordChangedOnLdapServer()) {
 			pwLink = LinkFactory.createLink("_olat_login_change_pwd", "menu.pw", loginComp, this);
-			pwLink.setCustomEnabledLinkCSS("o_login_pwd");
+			pwLink.setCustomEnabledLinkCSS("o_login_pwd  b_with_small_icon_left");
 		}
 		if (LoginModule.isGuestLoginLinksEnabled()) {
 			anoLink = LinkFactory.createLink("_olat_login_guest", "menu.guest", loginComp, this);
-			anoLink.setCustomEnabledLinkCSS("o_login_guests");
+			anoLink.setCustomEnabledLinkCSS("o_login_guests  b_with_small_icon_left");
 		}
 		
 		// Use the standard OLAT login form but with our LDAP translator