Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

src/main/java/org/olat/user/propertyhandlers/GenericSelectionPropertyHandler.java

@@ -260,10 +260,8 @@ public class GenericSelectionPropertyHandler extends AbstractUserPropertyHandler
 		}
 		if (formItem instanceof SingleSelection) {
 			SingleSelection sel = (SingleSelection)formItem;
-			if(sel.isOneSelected()) {
+			if(sel.isOneSelected() && !NO_SEL_KEY.equals(sel.getSelectedKey())) {
 				return sel.getSelectedKey();
-			} else {
-				return null;
 			}
 		}
 		return null;