1 files changed, 7 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php
index 080e338fe..b85192b29 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -282,7 +282,13 @@ class User extends Memcached_DataObject
             }
 
             $user->id = $id;
-            $user->uri = common_user_uri($user);
+
+            if (!empty($uri)) {
+                $user->uri = $uri;
+            } else {
+                $user->uri = common_user_uri($user);
+            }
+
             if (!empty($password)) { // may not have a password for OpenID users
                 $user->password = common_munge_password($password, $id);
             }