diff --git a/web/skins/classic/views/js/server.js b/web/skins/classic/views/js/server.js
index 746ea41bb..c2e62aebc 100644
--- a/web/skins/classic/views/js/server.js
+++ b/web/skins/classic/views/js/server.js
@@ -1,11 +1,11 @@
-function validateForm( form, newServer ) {
+function validateForm(form) {
   var errors = new Array();
   if ( !form.elements['newServer[Name]'].value ) {
-    errors[errors.length] = "You must supply a name";
+    errors[errors.length] = 'You must supply a name';
   }
   if ( errors.length ) {
-    alert( errors.join( "\n" ) );
-    return( false );
+    alert(errors.join("\n"));
+    return false;
   }
-  return( true );
+  return true;
 }
diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
index 42dd5fc6f..c07fd48d7 100644
--- a/web/skins/classic/views/server.php
+++ b/web/skins/classic/views/server.php
@@ -39,7 +39,7 @@ xhtmlHeaders(__FILE__, translate('Server').' - '.$Server->Name());
       <h2><?php echo translate('Server').' - '.$Server->Name() ?></h2>
     </div>
     <div id="content">
-      <form name="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm(this, <?php echo empty($Server->Name())?'true':'false' ?>)">
+      <form name="contentForm" method="post" action="?" onsubmit="return validateForm(this)">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="object" value="server"/>
         <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>