diff --git a/spring-session/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java
index 28b2e8b9..2bf90cfa 100644
--- a/spring-session/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java
+++ b/spring-session/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,6 +105,7 @@ import org.springframework.util.StringUtils;
  * );
  *
  * CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+ * CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
  *
  * CREATE TABLE SPRING_SESSION_ATTRIBUTES (
  *  SESSION_ID CHAR(36),
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql
index a2c1ad2b..cc1ca714 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql
index a2c1ad2b..cc1ca714 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql
index d3278d30..1810deac 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql
index d3278d30..1810deac 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql
index 0739d69c..8239cb43 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 ) ENGINE=InnoDB;
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql
index 2444869f..b62bc4c7 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql
index 4889ec7a..608d1aba 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql
index c2590c05..f4a66737 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql
index 16133629..0b402a0e 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 );
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql
index 1695dde6..3e9c4db8 100644
--- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql
+++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql
@@ -8,6 +8,7 @@ CREATE TABLE SPRING_SESSION (
 ) LOCK DATAROWS;
 
 CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME);
+CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (PRINCIPAL_NAME);
 
 CREATE TABLE SPRING_SESSION_ATTRIBUTES (
 	SESSION_ID CHAR(36) NOT NULL,