diff --git a/inc/html.php b/inc/html.php
index 793a0d08f580cd81f4378e49c832f21c6409b188..57bfd26d3df0dc4a8971e64c74274e952590d8d9 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -53,7 +53,7 @@ function html_login(){
   ?>
     <div class="centeralign">
     <form action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>"
-          method="post" name="login">
+          method="post" id="dw__login">
       <fieldset>
         <legend><?php echo $lang['btn_login']?></legend>
         <input type="hidden" name="id" value="<?php echo $ID?>" />
diff --git a/inc/media.php b/inc/media.php
index a74f55956d2fe108ff3850e655a027ca79521692..fb185435dd9e912c2a8456673b72b1dee30b300b 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -97,7 +97,6 @@ function media_metaform($id,$auth){
     // output
     echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
     echo '<form action="'.DOKU_BASE.'lib/exe/mediamanager.php" accept-charset="utf-8" method="post" class="meta">'.NL;
-    echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
     foreach($fields as $key => $field){
         // get current value
         $tags = array($field[0]);
@@ -124,11 +123,12 @@ function media_metaform($id,$auth){
             echo "<input $att/>".NL;
         }else{
             $att = buildAttributes($p);
-            echo "<textarea $att>".formText($value).'</textarea>'.NL;
+            echo "<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>'.NL;
         }
         echo '</div>'.NL;
     }
     echo '<div class="buttons">'.NL;
+    echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
     echo '<input name="do[save]" type="submit" value="'.$lang['btn_save'].
          '" title="ALT+S" accesskey="s" class="button" />'.NL;
     echo '<input name="do[cancel]" type="submit" value="'.$lang['btn_cancel'].