diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 7779379b12..fff6e3bd9a 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -78,7 +78,8 @@ class ProfilesettingsAction extends SettingsAction {
 		$profile->homepage = $this->arg('homepage');
 		$profile->bio = $this->arg('bio');
 		$profile->location = $this->arg('location');
-
+		$profile->profileurl = common_profile_url($nickname);
+		
 		if (!$profile->update()) {
 			common_server_error(_t('Couldnt save profile.'));
 			return;
diff --git a/actions/register.php b/actions/register.php
index 5c30fa1b36..fcf371d3a2 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -81,6 +81,7 @@ class RegisterAction extends Action {
 		# TODO: wrap this in a transaction!
 		$profile = new Profile();
 		$profile->nickname = $nickname;
+		$profile->profileurl = common_profile_url($nickname);
 		$profile->created = DB_DataObject_Cast::dateTime(); # current time
 		$id = $profile->insert();
 		if (!$id) {
diff --git a/doc/TODO b/doc/TODO
index ea703c3fe9..13186779f4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -23,6 +23,7 @@
 + new notice redirects to notice page
 + date in shown notice links to notice page
 + common_redirect()
++ configuration system ($config)
 + release 0.1
 - doc action
 - default to doc, title = main
@@ -30,11 +31,12 @@
 - default HTML type
 - set Content-Type
 - show current values in profile settings
+- save profile URL in profilesettings
+- save profile URL on registration
 - require valid nicknames
 - store canonical username for comparison and fetch
 - use only canonical usernames
 - use only canonical email addresses
-- configuration system ($config)
 - RSS 1.0 feeds of a user's notices
 - RSS 1.0 dump of a user's notices
 - RSS 1.0 feed of all public notices
diff --git a/lib/common.php b/lib/common.php
index 85654d3064..e8a7ac6aed 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -317,6 +317,10 @@ function common_broadcast_notices($id) {
 	return true;
 }
 
+function common_profile_url($nickname) {
+	return common_local_url('showstream', array('nickname' => $nickname));
+}
+
 // XXX: set up gettext
 
 function _t($str) {