diff --git a/server/index.php b/server/index.php
index fbd82e3..4384b3a 100644
--- a/server/index.php
+++ b/server/index.php
@@ -78,14 +78,11 @@ else
     <link rel="stylesheet" type="text/css"  href="resources/gpass.css" />
     <script language="javascript">
     <?php
-    echo "pkdbf2_level=$PKDBF2_LEVEL; use_shadow_logins=$USE_SHADOW_LOGINS;\n";
+    echo "pbkdf2_level=$PBKDF2_LEVEL; use_shadow_logins=$USE_SHADOW_LOGINS;\n";
     echo "CLEAR_TIME=$CLEAR_TIME; // Clear master key after 15 minutes\n";
     ?>
     </script>
-    <script src="resources/jsaes.js"></script>
-    <script src="resources/jssha256.js"></script>
-    <script src="resources/hmac.js"></script>
-    <script src="resources/pkdbf2.js"></script>
+    <script src="resources/misc.js"></script>
     <script src="resources/gpass.js"></script>
     <script src="resources/pwdmeter.js"></script>
     <title>gPass : global Password</title>
@@ -137,8 +134,6 @@ else
    echo "<div id=\"addon_address\">Current addon address is : https://" . $_SERVER['SERVER_NAME'] . "/" . $user . "</div>\n";
 }
 ?>
-<div id="passwords">
-</div>
 <div id="add_new_password">
 <?php
     global $user;
@@ -158,6 +153,8 @@ if ($user != "")
 }
 ?>
 </div>
+<div id="passwords">
+</div>
 <div id="update_masterkey">
 <?php
     global $user;