diff --git a/umbraco/presentation/umbraco/login.aspx b/umbraco/presentation/umbraco/login.aspx
index 9b028d1bdd..6d65d3fd92 100644
--- a/umbraco/presentation/umbraco/login.aspx
+++ b/umbraco/presentation/umbraco/login.aspx
@@ -42,7 +42,7 @@
           <asp:Literal ID="TopText" runat="server"></asp:Literal>
         </p>
         
-        <table cellspacing="0" cellpadding="0" border="0">
+        <table id="loginTable" cellspacing="0" cellpadding="0" border="0">
           <tr>
             <td align="right">
             <asp:Label ID="username" runat="server" AssociatedControlID="lname"></asp:Label>
@@ -90,7 +90,7 @@
   </form>
 
   <script type="text/javascript">
-        jQuery("#ctl00_body_lname").focus();
+        jQuery("#<%= lname.ClientID %>").focus();
         jQuery('#<%= hf_height.ClientID %>').value = getViewportHeight();
         jQuery('#<%= hf_width.ClientID %>').value = getViewportWidth();    
     </script>
@@ -101,8 +101,8 @@
         <script type="text/javascript">
             jQuery(document).ready(function() {
             jQuery("#loginTable").effect("shake", { times: 5, distance: 5 }, 80);
-            jQuery("#ctl00_body_lname").attr("style", jQuery("#ctl00_body_lname").attr("style") + "; border: 2px solid red;");
-            jQuery("#ctl00_body_passw").attr("style", jQuery("#ctl00_body_lname").attr("style") + "; border: 2px solid red;");
+            jQuery("#<%= lname.ClientID %>").attr("style", jQuery("#<%= lname.ClientID %>").attr("style") + "; border: 2px solid red;");
+            jQuery("#<%= passw.ClientID %>").attr("style", jQuery("#<%= passw.ClientID %>").attr("style") + "; border: 2px solid red;");
         });
         </script>
 
diff --git a/umbraco/presentation/umbraco/login.aspx.designer.cs b/umbraco/presentation/umbraco/login.aspx.designer.cs
index 5892cac4c3..6ae8e6dbb3 100644
--- a/umbraco/presentation/umbraco/login.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/login.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
+//     Runtime Version:2.0.50727.3603
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.