diff --git a/admin/inc/hook_admin.inc.php b/admin/inc/hook_admin.inc.php
index ddb2d18502..d99dbdbd19 100644
--- a/admin/inc/hook_admin.inc.php
+++ b/admin/inc/hook_admin.inc.php
@@ -54,7 +54,7 @@
 	// These need to be added still
 	$file['View Access Log']            = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccess_history.list_history');
 	$file['View Error Log']             = $GLOBALS['phpgw']->link('/admin/log.php');
-	$file['phpInfo']                    = $GLOBALS['phpgw']->link('/admin/phpinfo.php');
+	$file['phpInfo']                    = "javascript:openwindow('" . $GLOBALS['phpgw']->link('/admin/phpinfo.php') . "')"; //$GLOBALS['phpgw']->link('/admin/phpinfo.php');
 
 	//Do not modify below this line
 	display_section('admin','admin',$file);
diff --git a/admin/phpinfo.php b/admin/phpinfo.php
index b94291bed8..e1ecfe1c6f 100755
--- a/admin/phpinfo.php
+++ b/admin/phpinfo.php
@@ -12,12 +12,13 @@
 	/* $Id$ */
 
 	$phpgw_info['flags'] = array(
-		'currentapp' => 'admin',
-		'enable_nextmatchs_class' => True
+		'noheader'   => True,
+		'nonavbar'   => True,
+		'currentapp' => 'admin'
 	);
 	include('../header.inc.php');
 
 	phpinfo();
 
-	$phpgw->common->phpgw_footer();
-?>
+//	$phpgw->common->phpgw_footer();
+?>
\ No newline at end of file
diff --git a/admin/templates/default/index.tpl b/admin/templates/default/index.tpl
index 21d21b36f5..410675d84a 100755
--- a/admin/templates/default/index.tpl
+++ b/admin/templates/default/index.tpl
@@ -1,4 +1,25 @@
 <!-- BEGIN list -->
+<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+	var phpinfo;
+
+	function openwindow(url)
+	{
+		if (phpinfo)
+		{
+			if (phpinfo.closed)
+			{
+				phpinfo.stop;
+				phpinfo.close;
+			}
+		}
+		phpinfo = window.open(url, "phpinfoWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
+		if (phpinfo.opener == null)
+		{
+			phpinfo.opener = window;
+		}
+	}
+</SCRIPT>
+
 <table width="75%" border="0" cellspacing="0" cellpadding="0">
  {rows}
 </table>