diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index a50d8ddf91..8204245b53 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -416,7 +416,7 @@ class setup
 				return True;	// match
 			}
 		}
-		$GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address');
+		$GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address').' '.$remoteip;
 		error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip,true));
 		return False;
 	}
diff --git a/setup/index.php b/setup/index.php
index 6897d573e1..095da7ec5e 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -70,7 +70,11 @@ $GLOBALS['egw_setup']->html->show_header(
 	$GLOBALS['egw_info']['setup']['header_msg'],
 	False,
 	'config',
-	$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')'
+	$GLOBALS['egw_setup']->ConfigDomain . ' (' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
+		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_user'].'@'.
+		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_host'].':'.
+		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_port'].'/'.
+		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'] . ')'
 );
 /* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */
 /* $GLOBALS['egw_setup']->clear_session_cache(); */