diff --git a/templates/default/selectidp-links.php b/templates/default/selectidp-links.php
index e5e27dfb90e5f35718a5386977bd5fb3660b038b..7ac0494e6aa1accfcf59881abbbef53419057645 100644
--- a/templates/default/selectidp-links.php
+++ b/templates/default/selectidp-links.php
@@ -49,7 +49,9 @@ foreach ($this->data['idplist'] AS $idpentry) {
 			}
 			echo htmlspecialchars($this->t('idpname_' . $idpentry['entityid'])) . '</h3>';
 
-			echo '	<p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+			if (!empty($idpentry['description'])) {
+				echo '	<p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+			}
 			echo('<input id="preferredidp" type="submit" name="idp_' .
 				htmlspecialchars($idpentry['entityid']) . '" value="' .
 				$this->t('select') . '" /></p>');
@@ -66,7 +68,10 @@ foreach ($this->data['idplist'] AS $idpentry) {
 				}
 				echo htmlspecialchars($this->t('idpname_' . $idpentry['entityid'])) . '</h3>';
 
-				echo '	<p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+				if (!empty($idpentry['description'])) {
+
+					echo '	<p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+				}
 				echo('<input id="preferredidp" type="submit" name="idp_' .
 					htmlspecialchars($idpentry['entityid']) . '" value="' .
 					$this->t('select') . '" /></p>');
diff --git a/www/saml2/sp/idpdisco.php b/www/saml2/sp/idpdisco.php
index 93fa7fd9e52149a95df0a14490cc4ab2ed99f796..f6d5d852940d8740da6b0ced0f1bad6d6fc0e275 100644
--- a/www/saml2/sp/idpdisco.php
+++ b/www/saml2/sp/idpdisco.php
@@ -105,6 +105,7 @@ if($selectedIdP !== NULL) {
 		}
 	}
 
+	SimpleSAML_Logger::info('SAML2.0 - SP.idpDisco: Choice made [ ' . $selectedIdP . '] (Redirecting the user back)');
 	SimpleSAML_Utilities::redirect($return, array($returnidparam => $selectedIdP));
 }