diff --git a/ChangeLog b/ChangeLog
index 8bd98a7c4..a8556a309 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-04-30 Michal Cihar  <michal@cihar.com>
+    * libraries/auth/cookie.auth.lib.php: Do not double frames on login (bug
+      #944870).
+
 2004-04-29 Garvin Hicking <pma@supergarv.de>
     * db_details_structure.php: Bug #942362 - Colspan off by one
     * left.php: Modified js function to fit typecasting of Safari
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 86f6e015c..aa2e82df2 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -218,7 +218,7 @@ input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?ph
         echo "\n";
         ?>
 <!-- Language selection -->
-<form method="post" action="index.php">
+<form method="post" action="index.php" target="_top">
     <input type="hidden" name="server" value="<?php echo $server; ?>" />
     <b>Language:&nbsp;</b>
     <select name="lang" dir="ltr" onchange="this.form.submit();">
@@ -264,7 +264,7 @@ input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?ph
 
 
 <!-- Login form -->
-<form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?>>
+<form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?> target="_top">
     <table cellpadding="5">
 <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { ?>
     <tr>