diff --git a/mod/network.php b/mod/network.php
index 219808afc4..cdd8a4976b 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -36,6 +36,7 @@ function network_content(&$a, $update = false) {
 		$o .= replace_macros($tpl,array(
 			'$return_path' => $a->cmd,
 			'$baseurl' => $a->get_baseurl(),
+			'$defloc' => $a->user['default-location'],
 			'$visitor' => 'block',
 			'$lockstate' => 'unlock',
 			'$acl' => populate_acl($a->user),
diff --git a/mod/profile.php b/mod/profile.php
index 44f7181020..c5047d6154 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -149,6 +149,7 @@ function profile_content(&$a, $update = false) {
 				$lockstate = 'unlock';
 			$o .= replace_macros($tpl,array(
 				'$baseurl' => $a->get_baseurl(),
+				'$defloc' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? $a->user['default-location'] : ''),
 				'$return_path' => $a->cmd,
 				'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
 				'$lockstate' => $lockstate,
diff --git a/mod/settings.php b/mod/settings.php
index 71109d9033..f9cc429df2 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -56,6 +56,7 @@ function settings_post(&$a) {
 	$username = notags(trim($_POST['username']));
 	$email = notags(trim($_POST['email']));
 	$timezone = notags(trim($_POST['timezone']));
+	$defloc = notags(trim($_POST['defloc']));
 
 	$publish = (($_POST['profile_in_directory'] == 1) ? 1: 0);
 	$net_publish = (($_POST['profile_in_netdirectory'] == 1) ? 1: 0);
@@ -136,7 +137,7 @@ function settings_post(&$a) {
 		$str_contact_deny = implode('',$contact_deny);
 	}
 
-	$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `theme` = '%s'  WHERE `uid` = %d LIMIT 1",
+	$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `default-location` = '%s', `theme` = '%s'  WHERE `uid` = %d LIMIT 1",
 			dbesc($username),
 			dbesc($email),
 			dbesc($timezone),
@@ -145,6 +146,7 @@ function settings_post(&$a) {
 			dbesc($str_contact_deny),
 			dbesc($str_group_deny),
 			intval($notify),
+			dbesc($defloc),
 			dbesc($theme),
 			intval($_SESSION['uid'])
 	);
@@ -200,6 +202,7 @@ function settings_content(&$a) {
 	$nickname = $a->user['nickname'];
 	$timezone = $a->user['timezone'];
 	$notify   = $a->user['notify-flags'];
+	$defloc   = $a->user['default-location'];
 
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
@@ -269,6 +272,7 @@ function settings_content(&$a) {
 		'$nickname_block' => $nickname_block,
 		'$timezone' => $timezone,
 		'$zoneselect' => select_timezone($timezone),
+		'$defloc' => $defloc,
 		'$profile_in_dir' => $profile_in_dir,
 		'$profile_in_net_dir' => $profile_in_net_dir,
 		'$permissions' => t('Default Post Permissions'),
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 39f8adc6ef..8c7cce360d 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -81,7 +81,7 @@ tinyMCE.init({
 	}
 
 	function jotGetLocation() {
-		reply = prompt("Where are you right now?");
+		reply = prompt("Where are you right now?", $('#jot-location').val());
 		if(reply && reply.length) {
 			$('#jot-location').val(reply);
 		}
diff --git a/view/jot.tpl b/view/jot.tpl
index 5ceb795037..586274c35c 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -9,7 +9,7 @@
 <input type="hidden" name="type" value="wall" />
 <input type="hidden" name="profile_uid" value="$profile_uid" />
 <input type="hidden" name="return" value="$return_path" />
-<input type="hidden" name="location" id="jot-location" value="" />
+<input type="hidden" name="location" id="jot-location" value="$defloc" />
 
 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
diff --git a/view/settings.tpl b/view/settings.tpl
index ce13e2e2e1..aa0bf17e03 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -25,6 +25,13 @@ $zoneselect
 </div>
 <div id="settings-timezone-end" ></div>
 
+<div id="settings-defloc-wrapper" >
+<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
+<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
+</div>
+<div id="settings-defloc-end" ></div>
+
+
 <div id="settings-theme-select">
 <label id="settings-theme-label" for="theme-select" >Display Theme: </label>
 $theme
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 57d2888f48..92fb938876 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -282,7 +282,8 @@ input#dfrn-url {
 
 #settings-username-end, 
 #settings-email-end, 
-#settings-nick-end, 
+#settings-nick-end,
+#settings-defloc-end, 
 #settings-timezone-end,
 #settings-theme-end, 
 #settings-password-end, 
@@ -298,7 +299,8 @@ input#dfrn-url {
 
 #settings-username-label, 
 #settings-email-label, 
-#settings-nick-label, 
+#settings-nick-label,
+#settings-defloc-label, 
 #settings-timezone-label, 
 #settings-theme-label,
 #settings-password-label, 
@@ -315,6 +317,7 @@ input#dfrn-url {
 #settings-username, 
 #settings-email, 
 #settings-nick, 
+#settings-defloc,
 #timezone-select, 
 #theme-select,
 #settings-password, 
@@ -328,7 +331,12 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
-#settings-theme-label {
+#settings-theme-label,
+#settings-defloc-label {
+	margin-top: 20px;
+}
+
+#settings-defloc {
 	margin-top: 20px;
 }