diff --git a/functions.php b/functions.php
index f2f4d7a..b3ab041 100644
--- a/functions.php
+++ b/functions.php
@@ -1589,8 +1589,10 @@ function pinc_enqueue_scripts()
         $user_info = get_userdata($user_ID);
         if(!empty($user_info->pinc_user_timezone)){
             $timeZoneSet = $user_info->pinc_user_timezone;
-        }else{
+        }else if (!empty(get_option('timezone_string'))){
             $timeZoneSet = get_option('timezone_string');
+        }else {
+            $timeZoneSet = "Etc/Greenwich";
         }
         $getUserDate = new DateTime(null, new DateTimeZone($timeZoneSet));
         $currentTime = $getUserDate->format('H:i:s');
diff --git a/page_cp_settings.php b/page_cp_settings.php
index 84764b9..2986708 100644
--- a/page_cp_settings.php
+++ b/page_cp_settings.php
@@ -356,8 +356,13 @@ function pinc_edit_user( $user_id = 0 ) {
 
 				<div class="form-group">
 					<label class="form-label" for="pinc_user_timezone"><?php _e('your time zone', 'pinc'); ?></label>
+					<?php
+					$apiTZ ="http://ip-api.com/json/{$_SERVER['REMOTE_ADDR']}?fields=timezone";
+					$userTZstr = json_decode(file_get_contents($apiTZ),1)["timezone"];
+					$userCurrentTZ = esc_attr($user_info->pinc_user_timezone);
+					?>
 					<select class="form-control" type="text" name="pinc_user_timezone" id="pinc_user_timezone" value="<?php echo esc_attr($user_info->pinc_user_timezone); ?>">
-						<option value="<?php echo esc_attr($user_info->pinc_user_timezone); ?>" selected="selected"><?php echo esc_attr($user_info->pinc_user_timezone); ?></option>
+						<option value="<?php if (!isset($userCurrentTZ)){ echo $userTZstr; } else { echo esc_attr($user_info->pinc_user_timezone); } ?>" selected="selected"><?php if (!isset($userCurrentTZ)){ echo $userTZstr; } else { echo esc_attr($user_info->pinc_user_timezone); }  ?></option>
 						<option value="Pacific/Midway">(UTC-11:00) Midway Island</option>
 				        <option value="Pacific/Samoa">(UTC-11:00) Samoa</option>
 				        <option value="Pacific/Honolulu">(UTC-10:00) Hawaii</option>