diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
index 4841f6ac4..ab95c3171 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
@@ -4,7 +4,6 @@
 <!-- Le javascript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script type="text/javascript" src="resources/js/jquery.min.js"></script>
 <script type="text/javascript" src="resources/bootstrap2/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="resources/js/underscore-min.js"></script>
 <script type="text/javascript" src="resources/js/backbone-min.js"></script>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag
index 232d4b8bf..42c0365ba 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag
@@ -46,6 +46,9 @@
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../bootstrap2/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../bootstrap2/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="../bootstrap2/ico/apple-touch-icon-57-precomposed.png">
+
+    <!-- Load jQuery up here so that we can use in-page functions -->
+    <script type="text/javascript" src="resources/js/jquery.min.js"></script>
 </head>
 
 <body>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp
index df841921a..bb546edbd 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp
+++ b/openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp
@@ -5,7 +5,7 @@
 <script type="text/javascript">
 <!--
 
-$().ready(function() {
+$(document).ready(function() {
 	$('#j_username').focus();
 });
 
