diff --git a/cas-server-support-jdbc/src/main/java/org/jasig/cas/adaptors/jdbc/SearchModeSearchDatabaseAuthenticationHandler.java b/cas-server-support-jdbc/src/main/java/org/jasig/cas/adaptors/jdbc/SearchModeSearchDatabaseAuthenticationHandler.java
index 774446c..f192549 100644
--- a/cas-server-support-jdbc/src/main/java/org/jasig/cas/adaptors/jdbc/SearchModeSearchDatabaseAuthenticationHandler.java
+++ b/cas-server-support-jdbc/src/main/java/org/jasig/cas/adaptors/jdbc/SearchModeSearchDatabaseAuthenticationHandler.java
@@ -39,7 +39,7 @@ import javax.validation.constraints.NotNull;
 public class SearchModeSearchDatabaseAuthenticationHandler extends
     AbstractJdbcUsernamePasswordAuthenticationHandler implements InitializingBean {
 
-    private static final String SQL_PREFIX = "Select count('x') from ";
+    private static final String SQL_PREFIX = "select count('x') from ";
 
     @NotNull
     private String fieldUser;
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml
index 47456c5..6f514d1 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml
@@ -31,6 +31,6 @@
 	</description>
        
 	<bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location" value="file:///data/config/cas.properties" />
+		<property name="location" value="file:///data/program/cas/cas.properties" />
 	</bean>
 </beans>
diff --git a/cas-server-webapp/src/main/webapp/index.jsp b/cas-server-webapp/src/main/webapp/index.jsp
index 7256ced..f6e4fe0 100644
--- a/cas-server-webapp/src/main/webapp/index.jsp
+++ b/cas-server-webapp/src/main/webapp/index.jsp
@@ -39,6 +39,8 @@
   --%>
 
 <%
+final String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
 final String queryString = request.getQueryString();
-final String url = request.getContextPath() + "/login" + (queryString != null ? "?" + queryString : "");
-response.sendRedirect(response.encodeURL(url));%>
+final String url = basePath + "/login" + (queryString != null ? "?" + queryString : "");
+response.sendRedirect(response.encodeURL(url));
+%>