diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index b204609f4..3c29613b8 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -452,12 +452,12 @@ class Application_Model_Preference
         if (is_null($timezone)) {
             $timezone = self::GetDefaultTimezone();
         }
-        self::setValue("user_".$userId."_timezone", $timezone, true, $userId);
+        self::setValue("user_timezone", $timezone, true, $userId);
     }
 
     public static function GetUserTimezone($id)
     {
-        return self::getValue("user_".$id."_timezone", true);
+        return self::getValue("user_timezone", true);
     }
 
     public static function GetTimezone()
@@ -484,7 +484,7 @@ class Application_Model_Preference
 
     public static function GetUserLocale($id)
     {
-        return self::getValue("user_".$id."_locale", true);
+        return self::getValue("user_locale", true);
     }
 
     public static function SetUserLocale($userId, $locale = null)
@@ -494,7 +494,7 @@ class Application_Model_Preference
         if (is_null($locale)) {
             $locale = self::GetDefaultLocale();
         }
-        self::setValue("user_".$userId."_locale", $locale, true, $userId);
+        self::setValue("user_locale", $locale, true, $userId);
     }
 
     public static function GetLocale()
diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql
index a5d92eabd..851aea050 100644
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@@ -322,7 +322,7 @@ INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s3_channels', 'ste
 -- added in 2.3
 INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA');
 
-INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_1_locale', 'en_CA');
+INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
 
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', 'Chinese');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index e7a9ad6e5..891ea1acb 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -340,7 +340,7 @@ class AirtimeInstall
         if ($result < 1) {
             return false;
         }
-        $sql = "INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_1_timezone', '$defaultTimezone')";
+        $sql = "INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_timezone', '$defaultTimezone')";
         $result = $con->exec($sql);
         if ($result < 1) {
             return false;