Index: lams_build/conf/j2ee/jboss-all.xml
===================================================================
diff -u -r4195e32352245e0ee2323b3d70ab3f23ef3f750e -r295f984bfb886dae0195b609668cedeae35c692b
--- lams_build/conf/j2ee/jboss-all.xml	(.../jboss-all.xml)	(revision 4195e32352245e0ee2323b3d70ab3f23ef3f750e)
+++ lams_build/conf/j2ee/jboss-all.xml	(.../jboss-all.xml)	(revision 295f984bfb886dae0195b609668cedeae35c692b)
@@ -6,7 +6,7 @@
                 <http-only>true</http-only>
                 <secure>@secure.cookie@</secure>
             </cookie-config>
-            <session-timeout>120</session-timeout>
+            <session-timeout>30</session-timeout>
         </session-config>
     </shared-session-config>
 </jboss>
\ No newline at end of file
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -r56201e0ae360603f832e8071ddcfaa83bb676f91 -r295f984bfb886dae0195b609668cedeae35c692b
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 56201e0ae360603f832e8071ddcfaa83bb676f91)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 295f984bfb886dae0195b609668cedeae35c692b)
@@ -44,7 +44,7 @@
 values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs,.php,.jsp,.asp,.aspx,.pl,.do,.py,.tcl,.cgi,.shtml,.stm,.cfm,.adp', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('UserInactiveTimeout','10800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
+values ('UserInactiveTimeout','1800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1);
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -r56201e0ae360603f832e8071ddcfaa83bb676f91 -r295f984bfb886dae0195b609668cedeae35c692b
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 56201e0ae360603f832e8071ddcfaa83bb676f91)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 295f984bfb886dae0195b609668cedeae35c692b)
@@ -41,7 +41,7 @@
 values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs,.php,.jsp,.asp,.aspx,.pl,.do,.py,.tcl,.cgi,.shtml,.stm,.cfm,.adp', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('UserInactiveTimeout','10800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
+values ('UserInactiveTimeout','1800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1);
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r469d4be629dcce36adcd19e4eb18b5d49e0ac3ca -r295f984bfb886dae0195b609668cedeae35c692b
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 469d4be629dcce36adcd19e4eb18b5d49e0ac3ca)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 295f984bfb886dae0195b609668cedeae35c692b)
@@ -42,8 +42,7 @@
     public static String LAMS_TEMP_DIR = "TempDir";
 
     /**
-     * Directory in which lams.ear is deployed. Usually
-     * {JBOSS}/server/default/deploy/lams.ear
+     * Directory in which lams.ear is deployed. Usually {JBOSS}/server/default/deploy/lams.ear
      */
     public static String LAMS_EAR_DIR = "EARDir";
 
@@ -54,8 +53,7 @@
     public static String LAMS_ADMIN_EMAIL = "LamsSupportEmail";
 
     /**
-     * Flash crash dump files (see FlashCrashDump servlet) are written to the
-     * Dump directory
+     * Flash crash dump files (see FlashCrashDump servlet) are written to the Dump directory
      */
     public static String LAMS_DUMP_DIR = "DumpDir";
 
@@ -78,15 +76,13 @@
     public static String PREVIEW_CLEANUP_NUM_DAYS = "CleanupPreviewOlderThanDays";
 
     /**
-     * Number of milliseconds before a user is considered "inactive".
-     * "Anonymous" sessions are ended after this period (ie ones that haven't
-     * ever access one of the clients )
+     * Number of seconds before a user is considered "inactive" and gets logged out.
      */
     public static String INACTIVE_TIME = "UserInactiveTimeout";
 
     /**
-     * Allow more than one session to exist for one user. Needed for the test
-     * harness Do not set this parameter to true in production.
+     * Allow more than one session to exist for one user. Needed for the test harness Do not set this parameter to true
+     * in production.
      */
     public static String ALLOW_MULTIPLE_LOGIN = "AllowMultipleLogin";
 
@@ -106,8 +102,7 @@
     public static String SERVER_LANGUAGE = "ServerLanguage";
 
     /**
-     * Direction (left to right, right to left) for writing on HTML pages.
-     * Originally LTR
+     * Direction (left to right, right to left) for writing on HTML pages. Originally LTR
      */
     public static String SERVER_PAGE_DIRECTION = "ServerPageDirection";
 
@@ -215,8 +210,7 @@
     public static String LDAP_SEARCH_RESULTS_PAGE_SIZE = "LDAPSearchResultsPageSize";
 
     /**
-     * Number of learners to be displayed on the learner progress screen in
-     * monitoring.
+     * Number of learners to be displayed on the learner progress screen in monitoring.
      */
     public static String LEARNER_PROGRESS_BATCH_SIZE = "LearnerProgressBatchSize";
 
@@ -226,8 +220,7 @@
     public static String CUSTOM_TAB_TITLE = "CustomTabTitle";
 
     /**
-     * Configurable screen sizes for authoring, monitor, learner and admin
-     * (LDEV-1598)
+     * Configurable screen sizes for authoring, monitor, learner and admin (LDEV-1598)
      */
     public static String AUTHORING_SCREEN_SIZE = "AuthoringScreenSize";