diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d1fca1dd9..98471625b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -60,6 +60,6 @@ def #{s}!(redirect_url: nil)
 
   private
     def set_time_zone
-      Time.zone = current_user.time_zone if current_user and current_user.time_zone.present?
+      Time.zone = current_user.time_zone if current_user&.time_zone&.present?
     end
 end
diff --git a/db/migrate/20190809022738_add_user_time_zone.rb b/db/migrate/20190809022738_add_user_time_zone.rb
new file mode 100644
index 000000000..ca85d0f7c
--- /dev/null
+++ b/db/migrate/20190809022738_add_user_time_zone.rb
@@ -0,0 +1,5 @@
+class AddUserTimeZone < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :time_zone, :string
+  end
+end
diff --git a/db/migrate/20190814094307_add_user_time_zone.rb b/db/migrate/20190814094307_add_user_time_zone.rb
new file mode 100644
index 000000000..ca85d0f7c
--- /dev/null
+++ b/db/migrate/20190814094307_add_user_time_zone.rb
@@ -0,0 +1,5 @@
+class AddUserTimeZone < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :time_zone, :string
+  end
+end