diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
index e1a58c071..9daf3a63e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
@@ -86,12 +86,14 @@ CREATE TABLE `guacamole_user` (
   -- Time-based access restriction
   `access_window_start`    TIME,
   `access_window_end`      TIME,
-  `access_window_timezone` VARCHAR(64),
 
   -- Date-based access restriction
   `valid_from`  DATE,
   `valid_until` DATE,
 
+  -- Timezone used for all date/time comparisons and interpretation
+  `timezone` VARCHAR(64),
+
   PRIMARY KEY (`user_id`),
   UNIQUE KEY `username` (`username`)
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.8.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.8.sql
index bff3217ed..2d417db51 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.8.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.8.sql
@@ -26,7 +26,6 @@
 
 ALTER TABLE guacamole_user ADD COLUMN access_window_start    TIME;
 ALTER TABLE guacamole_user ADD COLUMN access_window_end      TIME;
-ALTER TABLE guacamole_user ADD COLUMN access_window_timezone VARCHAR(64);
 
 --
 -- Add per-user date-based account validity restrictions.
@@ -34,3 +33,9 @@ ALTER TABLE guacamole_user ADD COLUMN access_window_timezone VARCHAR(64);
 
 ALTER TABLE guacamole_user ADD COLUMN valid_from  DATE;
 ALTER TABLE guacamole_user ADD COLUMN valid_until DATE;
+
+--
+-- Add per-user timezone for sake of time comparisons/interpretation.
+--
+
+ALTER TABLE guacamole_user ADD COLUMN timezone VARCHAR(64);
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
index bc9ab5cae..dd5e69887 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
@@ -127,12 +127,14 @@ CREATE TABLE guacamole_user (
   -- Time-based access restriction
   access_window_start    time,
   access_window_end      time,
-  access_window_timezone varchar(64),
 
   -- Date-based access restriction
   valid_from  date,
   valid_until date,
 
+  -- Timezone used for all date/time comparisons and interpretation
+  timezone varchar(64),
+
   PRIMARY KEY (user_id),
 
   CONSTRAINT username
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.8.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.8.sql
index d1aa51f1e..be2d36898 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.8.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.8.sql
@@ -26,7 +26,6 @@
 
 ALTER TABLE guacamole_user ADD COLUMN access_window_start    time;
 ALTER TABLE guacamole_user ADD COLUMN access_window_end      time;
-ALTER TABLE guacamole_user ADD COLUMN access_window_timezone varchar(64);
 
 --
 -- Add per-user date-based account validity restrictions.
@@ -34,3 +33,9 @@ ALTER TABLE guacamole_user ADD COLUMN access_window_timezone varchar(64);
 
 ALTER TABLE guacamole_user ADD COLUMN valid_from  date;
 ALTER TABLE guacamole_user ADD COLUMN valid_until date;
+
+--
+-- Add per-user timezone for sake of time comparisons/interpretation.
+--
+
+ALTER TABLE guacamole_user ADD COLUMN timezone varchar(64);