From b0ffb721b61bcd6730ee0670421c60f2a097bab2 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sun, 15 Jan 2006 18:34:44 +0000
Subject: [PATCH] more session related bug fixes

---
 lib/WebGUI/Asset.pm                        | 10 +++----
 lib/WebGUI/Asset/FilePile.pm               |  2 +-
 lib/WebGUI/Asset/Post.pm                   | 26 +++++++++---------
 lib/WebGUI/Asset/Post/Thread.pm            | 32 +++++++++++-----------
 lib/WebGUI/Asset/Shortcut.pm               |  6 ++--
 lib/WebGUI/Asset/Wobject.pm                | 10 +++----
 lib/WebGUI/Asset/Wobject/Collaboration.pm  | 16 +++++------
 lib/WebGUI/Asset/Wobject/Dashboard.pm      | 14 +++++-----
 lib/WebGUI/Asset/Wobject/DataForm.pm       |  4 +--
 lib/WebGUI/Asset/Wobject/EventsCalendar.pm |  2 +-
 lib/WebGUI/Asset/Wobject/HttpProxy.pm      |  2 +-
 lib/WebGUI/Asset/Wobject/InOutBoard.pm     | 20 +++++++-------
 lib/WebGUI/Asset/Wobject/Matrix.pm         | 14 +++++-----
 lib/WebGUI/Asset/Wobject/Navigation.pm     |  2 +-
 lib/WebGUI/Asset/Wobject/Poll.pm           | 10 +++----
 lib/WebGUI/Asset/Wobject/StockData.pm      |  2 +-
 lib/WebGUI/Asset/Wobject/Survey.pm         |  6 ++--
 lib/WebGUI/AssetBranch.pm                  |  2 +-
 lib/WebGUI/AssetClipboard.pm               |  4 +--
 lib/WebGUI/AssetExportHtml.pm              |  2 +-
 lib/WebGUI/AssetLineage.pm                 |  2 +-
 lib/WebGUI/AssetTrash.pm                   |  4 +--
 lib/WebGUI/AssetVersioning.pm              | 14 +++++-----
 lib/WebGUI/Auth.pm                         |  2 +-
 lib/WebGUI/Auth/LDAP.pm                    |  2 +-
 lib/WebGUI/Auth/WebGUI.pm                  |  4 +--
 lib/WebGUI/Commerce/Payment/ITransact.pm   |  2 +-
 lib/WebGUI/Commerce/Transaction.pm         |  2 +-
 lib/WebGUI/Form/Template.pm                |  2 +-
 lib/WebGUI/Macro/At_username.pm            |  2 +-
 lib/WebGUI/Macro/L_loginBox.pm             |  2 +-
 lib/WebGUI/Macro/LoginToggle.pm            |  2 +-
 lib/WebGUI/Macro/RandomThread.pm           |  2 +-
 lib/WebGUI/Operation/Auth.pm               |  2 +-
 lib/WebGUI/Operation/Commerce.pm           |  4 +--
 lib/WebGUI/Operation/Group.pm              | 14 +++++-----
 lib/WebGUI/Operation/MessageLog.pm         |  8 +++---
 lib/WebGUI/Operation/Profile.pm            | 14 +++++-----
 lib/WebGUI/Operation/Shared.pm             |  2 +-
 lib/WebGUI/Operation/TransactionLog.pm     |  2 +-
 lib/WebGUI/Operation/User.pm               |  6 ++--
 lib/WebGUI/PassiveProfiling.pm             |  2 +-
 lib/WebGUI/Session/Privilege.pm            |  2 +-
 lib/WebGUI/Subscription.pm                 |  2 +-
 44 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index fbc35b35e..46697977a 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -77,7 +77,7 @@ Only developers extending this method should use this parameter. By default WebG
 sub canAdd {
 	my $className = shift;
 	my $session = shift;
-	my $userId = shift || $session->user->profileField("userId");
+	my $userId = shift || $session->user->userId;
 	my $subclassGroupId = shift;
 	my $groupId = $session->config->get("assetAddPrivilege")->{$className} || $subclassGroupId || '12';
         return $session->user->isInGroup($groupId,$userId);
@@ -98,7 +98,7 @@ Unique hash identifier for a user. If not supplied, current user.
 
 sub canEdit {
 	my $self = shift;
-	my $userId = shift || $self->session->user->profileField("userId");
+	my $userId = shift || $self->session->user->userId;
  	if ($userId eq $self->get("ownerUserId")) {
                 return 1;
 	}
@@ -123,7 +123,7 @@ Unique hash identifier for a user. If not specified, uses current userId.
 
 sub canView {
 	my $self = shift;
-	my $userId = shift || $self->session->user->profileField("userId");
+	my $userId = shift || $self->session->user->userId;
 	return 0 unless ($self->get("state") eq "published");
 	if ($userId eq $self->get("ownerUserId")) {
                 return 1;
@@ -576,7 +576,7 @@ sub getEditForm {
         my $clause;
         if ($self->session->user->isInGroup(3)) {
                 my $contentManagers = $self->session->group->getUsers(4,1);
-                push (@$contentManagers, $self->session->user->profileField("userId"));
+                push (@$contentManagers, $self->session->user->userId);
                 $clause = "userId in (".$self->session->db->quoteAndJoin($contentManagers).")";
         } else {
                 $clause = "userId=".$self->session->db->quote($self->get("ownerUserId"));
@@ -1270,7 +1270,7 @@ sub publish {
 	my $self = shift;
 	my $assetIds = $self->session->db->buildArrayRef("select assetId from asset where lineage like ".$self->session->db->quote($self->get("lineage").'%'));
         my $idList = $self->session->db->quoteAndJoin($assetIds);
-        $self->session->db->write("update asset set state='published', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged=".$self->session->datetime->time()." where assetId in (".$idList.")");
+        $self->session->db->write("update asset set state='published', stateChangedBy=".$self->session->db->quote($self->session->user->userId).", stateChanged=".$self->session->datetime->time()." where assetId in (".$idList.")");
 	my $cache = WebGUI::Cache->new;
         foreach my $id (@{$assetIds}) {
         	# we do the purge directly cuz it's a lot faster than instantiating all these assets
diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm
index 314346358..132bd94df 100644
--- a/lib/WebGUI/Asset/FilePile.pm
+++ b/lib/WebGUI/Asset/FilePile.pm
@@ -107,7 +107,7 @@ sub edit {
        	my $clause;
        	if ($self->session->user->isInGroup(3)) {
                	my $contentManagers = $group->getUsers(4,1);
-                push (@$contentManagers, $self->session->user->profileField("userId"));
+                push (@$contentManagers, $self->session->user->userId);
        	        $clause = "userId in (".$self->session->db->quoteAndJoin($contentManagers).")";
        	} else {
                	$clause = "userId=".$self->session->db->quote($self->get("ownerUserId"));
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index ae53f8330..ff758fcae 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -133,7 +133,7 @@ sub definition {
 				},
 			username => {
 				fieldType=>"hidden",
-				defaultValue=>$session->form->process("visitorUsername") || $session->user->profileField("alias") || $session->user->profileField("username")
+				defaultValue=>$session->form->process("visitorUsername") || $session->user->profileField("alias") || $session->user->username
 				},
 			rating => {
 				noFormPost=>1,
@@ -525,7 +525,7 @@ sub hasRated {
 	my $self = shift;
         return 1 if $self->isPoster;
         my ($flag) = $self->session->db->quickArray("select count(*) from Post_rating where assetId="
-                .$self->session->db->quote($self->getId)." and ((userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and userId<>'1') or (userId='1' and
+                .$self->session->db->quote($self->getId)." and ((userId=".$self->session->db->quote($self->session->user->userId)." and userId<>'1') or (userId='1' and
                 ipAddress=".$self->session->db->quote($self->session->env->get("REMOTE_ADDR"))."))");
         return $flag;
 }
@@ -554,7 +554,7 @@ Returns a boolean indicating whether this post is marked read for the user.
 sub isMarkedRead {
         my $self = shift;
 	return 1 if $self->isPoster;
-        my ($isRead) = $self->session->db->quickArray("select count(*) from Post_read where userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and postId=".$self->session->db->quote($self->getId));
+        my ($isRead) = $self->session->db->quickArray("select count(*) from Post_read where userId=".$self->session->db->quote($self->session->user->userId)." and postId=".$self->session->db->quote($self->getId));
         return $isRead;
 }
 
@@ -568,7 +568,7 @@ Returns a boolean that is true if the current user created this post and is not
 
 sub isPoster {
 	my $self = shift;
-	return ($self->session->user->profileField("userId") ne "1" && $self->session->user->profileField("userId") eq $self->get("ownerUserId"));
+	return ($self->session->user->userId ne "1" && $self->session->user->userId eq $self->get("ownerUserId"));
 }
 
 
@@ -597,7 +597,7 @@ Marks this post read for this user.
 sub markRead {
 	my $self = shift;
         unless ($self->isMarkedRead) {
-                $self->session->db->write("insert into Post_read (userId, postId, threadId, readDate) values (".$self->session->db->quote($self->session->user->profileField("userId")).",
+                $self->session->db->write("insert into Post_read (userId, postId, threadId, readDate) values (".$self->session->db->quote($self->session->user->userId).",
                         ".$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->get("threadId")).", ".$self->session->datetime->time().")");
         }
 }
@@ -652,12 +652,12 @@ sub processPropertiesFromFormPost {
 			$self->update({threadId=>$self->getParent->get("threadId")});
 		}
 		if ($self->session->setting->get("enableKarma") && $self->getThread->getParent->get("karmaPerPost")) {
-			my $u = WebGUI::User->new($self->session->user->profileField("userId"));
+			my $u = WebGUI::User->new($self->session->user->userId);
 			$u->addKarma($self->getThread->getParent->get("karmaPerPost"), $self->getId, "Collaboration post");
 		}
 		%data = (
-			ownerUserId => $self->session->user->profileField("userId"),
-			username => $self->session->form->process("visitorName") || $self->session->user->profileField("alias") || $self->session->user->profileField("username"),
+			ownerUserId => $self->session->user->userId,
+			username => $self->session->form->process("visitorName") || $self->session->user->profileField("alias") || $self->session->user->username,
 			isHidden => 1,
 			);
 		$data{url} = $self->fixUrl($self->getThread->get("url")."/1") if ($self->isReply);
@@ -702,8 +702,8 @@ sub processPropertiesFromFormPost {
 	}
 	$self->session->form->process("proceed") = "redirectToParent";
 	# clear some cache
-	WebGUI::Cache->new($self->session,"wobject_".$self->getThread->getParent->getId."_".$self->session->user->profileField("userId"))->delete;
-	WebGUI::Cache->new($self->session,"cspost_".($self->getParent->getId)."_".$self->session->user->profileField("userId")."_".$self->session->scratch->get("discussionLayout")."_1")->delete;
+	WebGUI::Cache->new($self->session,"wobject_".$self->getThread->getParent->getId."_".$self->session->user->userId)->delete;
+	WebGUI::Cache->new($self->session,"cspost_".($self->getParent->getId)."_".$self->session->user->userId."_".$self->session->scratch->get("discussionLayout")."_1")->delete;
 }
 
 
@@ -748,7 +748,7 @@ sub rate {
 	my $rating = shift || 3;
 	unless ($self->hasRated) {
         	$self->session->db->write("insert into Post_rating (assetId,userId,ipAddress,dateOfRating,rating) values ("
-                	.$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($self->session->env->get("REMOTE_ADDR")).", 
+                	.$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->user->userId).", ".$self->session->db->quote($self->session->env->get("REMOTE_ADDR")).", 
 			".$self->session->datetime->time().", ".$self->session->db->quote($rating).")");
         	my ($count) = $self->session->db->quickArray("select count(*) from Post_rating where assetId=".$self->session->db->quote($self->getId));
         	$count = $count || 1;
@@ -882,7 +882,7 @@ Negates the markRead method.
 
 sub unmarkRead {
 	my $self = shift;
-        $self->session->db->write("delete from forumRead where userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and postId=".$self->session->db->quote($self->getId));
+        $self->session->db->write("delete from forumRead where userId=".$self->session->db->quote($self->session->user->userId)." and postId=".$self->session->db->quote($self->getId));
 }
 
 #-------------------------------------------------------------------
@@ -1044,7 +1044,7 @@ sub www_edit {
 	$var{'form.footer'} = WebGUI::Form::formFooter($self->session,);
 	$var{usePreview} = $self->getThread->getParent->get("usePreview");
 	$var{'user.isModerator'} = $self->getThread->getParent->canModerate;
-	$var{'user.isVisitor'} = ($self->session->user->profileField("userId") eq '1');
+	$var{'user.isVisitor'} = ($self->session->user->userId eq '1');
 	$var{'visitorName.form'} = WebGUI::Form::text({
 		name=>"visitorName",
 		value=>$self->getValue("visitorName")
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index c02ace9e8..1731c065f 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -31,7 +31,7 @@ sub canReply {
 #-------------------------------------------------------------------
 sub canSubscribe {
 	my $self = shift;
-	return ($self->session->user->profileField("userId") ne "1" && $self->canView);
+	return ($self->session->user->userId ne "1" && $self->canView);
 }
 
 #-------------------------------------------------------------------
@@ -189,7 +189,7 @@ sub getNextThread {
 					and (
 						assetData.status in ('approved','archived')
 						 or assetData.tagId=".$self->session->db->quote($self->session->scratch->get("versionTag"))."
-						or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->profileField("userId"))." and assetData.ownerUserId<>'1')
+						or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->userId)." and assetData.ownerUserId<>'1')
 						)
 				group by assetData.assetId
 				order by ".$sortBy." asc 
@@ -227,7 +227,7 @@ sub getPreviousThread {
 					and (
 						assetData.status in ('approved','archived')
 						 or assetData.tagId=".$self->session->db->quote($self->session->scratch->get("versionTag"))."
-						or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->profileField("userId"))." and assetData.ownerUserId<>'1')
+						or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->userId)." and assetData.ownerUserId<>'1')
 						)
 				group by assetData.assetId
 				order by ".$sortBy." desc, assetData.revisionDate desc ",$self->session->db->getSlave);
@@ -372,7 +372,7 @@ Returns a boolean indicating whether this thread is marked read for the user.
 sub isMarkedRead {
         my $self = shift;
 	return 1 if $self->isPoster;
-      my ($isRead) = $self->session->db->quickArray("select count(*) from Post_read where userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and threadId=".$self->session->db->quote($self->getId)." and postId=".$self->session->db->quote($self->get("lastPostId")));
+      my ($isRead) = $self->session->db->quickArray("select count(*) from Post_read where userId=".$self->session->db->quote($self->session->user->userId)." and threadId=".$self->session->db->quote($self->getId)." and postId=".$self->session->db->quote($self->get("lastPostId")));
         return $isRead;
 }
 
@@ -444,7 +444,7 @@ sub rate {
 	my $rating = shift;
 	unless ($self->hasRated) {
 		$self->session->db->write("insert into Post_rating (assetId,userId,ipAddress,dateOfRating,rating) values ("
-			.$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($self->session->env->get("REMOTE_ADDR")).",
+			.$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->user->userId).", ".$self->session->db->quote($self->session->env->get("REMOTE_ADDR")).",
 		".$self->session->datetime->time().", ".$self->session->db->quote($rating).")");
 		my ($count) = $self->session->db->quickArray("select count(*) from Post left join asset on Post.assetId=asset.assetId where Post.threadId=".$self->session->db->quote($self->getId)." and Post.rating>0");
 		$count = $count || 1;
@@ -454,7 +454,7 @@ sub rate {
 		if ($self->session->setting->get("useKarma")) {
 			my $poster = WebGUI::User->new($self->get("ownerUserId"));
 			$poster->karma($rating*$self->getParent->get("karmaRatingMultiplier"),"collaboration rating","someone rated post ".$self->getId);
-			my $rater = WebGUI::User->new($self->session->user->profileField("userId"));
+			my $rater = WebGUI::User->new($self->session->user->userId);
 			$rater->karma(-$self->getParent->get("karmaSpentToRate"),"collaboration rating","spent karma to rate post ".$self->getId);
 		}
 		$self->getParent->recalculateRating;
@@ -546,8 +546,8 @@ Subscribes the user to this thread.
 sub subscribe {
 	my $self = shift;
 	$self->createSubscriptionGroup;
-  WebGUI::Cache->new($self->session,"cspost_".$self->getId."_".$self->session->user->profileField("userId")."_".$self->session->scratch->get("discussionLayout")."_".$self->session->form->process("pn"))->delete;
-  $group->addUsers([$self->session->user->profileField("userId")],[$self->get("subscriptionGroupId")]);
+  WebGUI::Cache->new($self->session,"cspost_".$self->getId."_".$self->session->user->userId."_".$self->session->scratch->get("discussionLayout")."_".$self->session->form->process("pn"))->delete;
+  $group->addUsers([$self->session->user->userId],[$self->get("subscriptionGroupId")]);
 }
 
 #-------------------------------------------------------------------
@@ -606,8 +606,8 @@ Negates the subscribe method.
 
 sub unsubscribe {
 	my $self = shift;
-  WebGUI::Cache->new($self->session,"cspost_".$self->getId."_".$self->session->user->profileField("userId")."_".$self->session->scratch->get("discussionLayout")."_".$self->session->form->process("pn"))->delete;
-  $group->deleteUsers([$self->session->user->profileField("userId")],[$self->get("subscriptionGroupId")]);
+  WebGUI::Cache->new($self->session,"cspost_".$self->getId."_".$self->session->user->userId."_".$self->session->scratch->get("discussionLayout")."_".$self->session->form->process("pn"))->delete;
+  $group->deleteUsers([$self->session->user->userId],[$self->get("subscriptionGroupId")]);
 }
 
 
@@ -620,7 +620,7 @@ sub view {
         my $var = $self->getTemplateVars;
 	$self->getParent->appendTemplateLabels($var);
 
-        $var->{'user.isVisitor'} = ($self->session->user->profileField("userId") eq '1');
+        $var->{'user.isVisitor'} = ($self->session->user->userId eq '1');
         $var->{'user.isModerator'} = $self->getParent->canModerate;
         $var->{'user.canPost'} = $self->getParent->canPost;
         $var->{'user.canReply'} = $self->canReply;
@@ -655,7 +655,7 @@ sub view {
 				assetData.status in ('approved','archived')
 						 or assetData.tagId=".$self->session->db->quote($self->session->scratch->get("versionTag"));
 	$sql .= "		or assetData.status='pending'" if ($self->getParent->canModerate);
-	$sql .= "		or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->profileField("userId"))." and assetData.ownerUserId<>'1')
+	$sql .= "		or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->userId)." and assetData.ownerUserId<>'1')
 			))
 		group by assetData.assetId
 		order by ";
@@ -795,19 +795,19 @@ sub www_view {
 		$self->session->form->process("func") eq "" && 
 		$self->session->form->process("layout") eq "" && 
 		(
-			( $self->getParent->get("cacheTimeout") > 10 && $self->session->user->profileField("userId") ne '1') || 
-			( $self->getParent->get("cacheTimeoutVisitor") > 10 && $self->session->user->profileField("userId") eq '1')
+			( $self->getParent->get("cacheTimeout") > 10 && $self->session->user->userId ne '1') || 
+			( $self->getParent->get("cacheTimeoutVisitor") > 10 && $self->session->user->userId eq '1')
 		) && 
 		not $self->session->var->get("adminOn")
 	);
 	if ($useCache) {
-               	$cache = WebGUI::Cache->new($self->session,"cspost_".($postId||$self->getId)."_".$self->session->user->profileField("userId")."_".$self->session->scratch->get("discussionLayout")."_".$self->session->form->process("pn"));
+               	$cache = WebGUI::Cache->new($self->session,"cspost_".($postId||$self->getId)."_".$self->session->user->userId."_".$self->session->scratch->get("discussionLayout")."_".$self->session->form->process("pn"));
            	$output = $cache->get;
 	}
 	unless ($output) {
 		$output = $self->getParent->processStyle($self->view);
 		my $ttl;
-		if ($self->session->user->profileField("userId") eq '1') {
+		if ($self->session->user->userId eq '1') {
 			$ttl = $self->getParent->get("cacheTimeoutVisitor");
 		} else {
 			$ttl = $self->getParent->get("cacheTimeout");
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 0c35d1b26..276433c62 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -213,7 +213,7 @@ sub definition {
 #-------------------------------------------------------------------
 sub discernUserId {
 	my $self = shift;
-	return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->profileField("userId");
+	return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->userId;
 }
 
 #-------------------------------------------------------------------
@@ -376,7 +376,7 @@ sub getOverrides {
 	my $self = shift;
 	my $i = 0;
 	#cache by userId, assetId of this shortcut, and whether adminMode is on or not.
-	my $cache = WebGUI::Cache->new($self->session,["shortcutOverrides",$self->getId,$self->session->user->profileField("userId"),$self->session->var->get("adminOn")]);
+	my $cache = WebGUI::Cache->new($self->session,["shortcutOverrides",$self->getId,$self->session->user->userId,$self->session->var->get("adminOn")]);
 	my $overridesRef = $cache->get;
 	unless ($overridesRef->{cacheNotExpired}) {
 		my %overrides;
@@ -637,7 +637,7 @@ sub www_edit {
 sub www_getUserPrefsForm {
 	#This is a form retrieved by "ajax".
 	my $self = shift;
-	return 'You are no longer logged in' if $self->session->user->profileField("userId") eq '1';
+	return 'You are no longer logged in' if $self->session->user->userId eq '1';
 	return 'You are not allowed to personalize this Dashboard.' unless $self->getParent->canPersonalize;
 	my $output;
 	my @fielden = $self->getPrefFieldsToShow;
diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index b3e69ed69..0f24061e2 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -134,7 +134,7 @@ Deletes the rendered page cache for this wobject.
 
 sub deletePageCache {
 	my $self = shift;
-        WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->profileField("userId"))->delete;
+        WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->userId)->delete;
 }
 
 #-------------------------------------------------------------------
@@ -597,19 +597,19 @@ sub www_view {
         my $useCache = (
 		$self->session->form->process("op") eq "" && $self->session->form->process("pn") eq "" 
 		&& (
-			( $self->get("cacheTimeout") > 10 && $self->session->user->profileField("userId") ne '1') 
-			|| ( $self->get("cacheTimeoutVisitor") > 10 && $self->session->user->profileField("userId") eq '1')
+			( $self->get("cacheTimeout") > 10 && $self->session->user->userId ne '1') 
+			|| ( $self->get("cacheTimeoutVisitor") > 10 && $self->session->user->userId eq '1')
 		) 
 		&& !( $self->session->var->get("adminOn") || $disableCache)
 	);
 	if ($useCache) {
-               	$cache = WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->profileField("userId"));
+               	$cache = WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->userId);
            	$output = $cache->get;
 	}
 	unless ($output) {
 		$output = $self->processStyle($self->view);
 		my $ttl;
-		if ($self->session->user->profileField("userId") eq '1') {
+		if ($self->session->user->userId eq '1') {
 			$ttl = $self->get("cacheTimeoutVisitor");
 		} else {
 			$ttl = $self->get("cacheTimeout");
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 1a8affa45..a3b6fd721 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -199,7 +199,7 @@ sub canPost {
 #-------------------------------------------------------------------
 sub canSubscribe {
         my $self = shift;
-        return ($self->session->user->profileField("userId") ne "1" && $self->canView);
+        return ($self->session->user->userId ne "1" && $self->canView);
 }
 
 #-------------------------------------------------------------------
@@ -864,9 +864,9 @@ Subscribes a user to this collaboration system.
 
 sub subscribe {
 	my $self = shift;
-	WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->profileField("userId"))->delete;
+	WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->userId)->delete;
 	my $group = WebGUI::Group->new($self->session,$self->get("subscriptionGroupId"));
-	$group->addUsers([$self->session->user->profileField("userId")]);
+	$group->addUsers([$self->session->user->userId]);
 }
 
 #-------------------------------------------------------------------
@@ -879,9 +879,9 @@ Unsubscribes a user from this collaboration system
 
 sub unsubscribe {
 	my $self = shift;
-	WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->profileField("userId"))->delete;
+	WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->userId)->delete;
 	my $group = WebGUI::Group->new($self->session,$self->get("subscriptionGroupId"));
-	$group->deleteUsers([$self->session->user->profileField("userId")],[$self->get("subscriptionGroupId")]);
+	$group->deleteUsers([$self->session->user->userId],[$self->get("subscriptionGroupId")]);
 }
 
 
@@ -909,7 +909,7 @@ sub view {
         $var{"add.url"} = $self->getNewThreadUrl;
         $var{"rss.url"} = $self->getRssUrl;
         $var{'user.isModerator'} = $self->canModerate;
-        $var{'user.isVisitor'} = ($self->session->user->profileField("userId") eq '1');
+        $var{'user.isVisitor'} = ($self->session->user->userId eq '1');
 	$var{'user.isSubscribed'} = $self->isSubscribed;
 	$var{'sortby.title.url'} = $self->getSortByUrl("title");
 	$var{'sortby.username.url'} = $self->getSortByUrl("username");
@@ -922,7 +922,7 @@ sub view {
 	$var{"search.url"} = $self->getSearchUrl;
 	$var{"subscribe.url"} = $self->getSubscribeUrl;
 	$var{"unsubscribe.url"} = $self->getUnsubscribeUrl;
-	my $constraints = "(assetData.status='approved' or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->profileField("userId"))." and assetData.ownerUserId<>'1') or assetData.tagId=".$self->session->db->quote($self->session->scratch->get("versionTag"));
+	my $constraints = "(assetData.status='approved' or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->userId)." and assetData.ownerUserId<>'1') or assetData.tagId=".$self->session->db->quote($self->session->scratch->get("versionTag"));
 	if ($var{'user.isModerator'}) {
 		$constraints .= " or assetData.status='pending'"; 
 	}
@@ -1058,7 +1058,7 @@ sub www_search {
 					assetData.status in ('approved','archived')
 				 or assetData.tagId=".$self->session->db->quote($self->session->scratch->get("versionTag"));
 		$sql .= "		or assetData.status='pending'" if ($self->canModerate);
-		$sql .= "		or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->profileField("userId"))." and assetData.ownerUserId<>'1')
+		$sql .= "		or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->userId)." and assetData.ownerUserId<>'1')
 					) ";
 		$sql .= " and ($all) " if ($all ne "");
 		$sql .= " and " if ($sql ne "" && $exactPhrase ne "");
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index fe6bf1c81..5660dbbd2 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -24,14 +24,14 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub canManage {
 	my $self = shift;
-	return 0 if $self->session->user->profileField("userId") == 1;
+	return 0 if $self->session->user->userId == 1;
 	return $self->session->user->isInGroup($self->get("adminsGroupId"));
 }
 
 #-------------------------------------------------------------------
 sub canPersonalize {
 	my $self = shift;
-	return 0 if $self->session->user->profileField("userId") == 1;
+	return 0 if $self->session->user->userId == 1;
 	return $self->session->user->isInGroup($self->get("usersGroupId"));
 }
 
@@ -88,7 +88,7 @@ sub getContentPositions {
 #-------------------------------------------------------------------
 sub discernUserId {
 	my $self = shift;
-	return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->profileField("userId");
+	return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->userId;
 }
 
 #-------------------------------------------------------------------
@@ -217,7 +217,7 @@ sub view {
 								shortcutUrl=>$child->getUrl,
 								canPersonalize=>$self->canPersonalize,
 								showReloadIcon=>$child->{_properties}{showReloadIcon},
-								canEditUserPrefs=>(($self->session->user->profileField("userId") ne '1') && (ref $child eq 'WebGUI::Asset::Shortcut') && (scalar($child->getPrefFieldsToShow) > 0))
+								canEditUserPrefs=>(($self->session->user->userId ne '1') && (ref $child eq 'WebGUI::Asset::Shortcut') && (scalar($child->getPrefFieldsToShow) > 0))
 							});
 							$newStuff .= 'available_dashlets["'.$child->getId.'"]=\''.$child->getUrl.'\';';
 
@@ -229,7 +229,7 @@ sub view {
 								shortcutUrl=>$child->getUrl,
 								canPersonalize=>$self->canPersonalize,
 								showReloadIcon=>$child->{_properties}{showReloadIcon},
-								canEditUserPrefs=>(($self->session->user->profileField("userId") ne '1') && (ref $child eq 'WebGUI::Asset::Shortcut') && (scalar($child->getPrefFieldsToShow) > 0))
+								canEditUserPrefs=>(($self->session->user->userId ne '1') && (ref $child eq 'WebGUI::Asset::Shortcut') && (scalar($child->getPrefFieldsToShow) > 0))
 							});
 							$newStuff .= 'available_dashlets["'.$child->getId.'"]=\''.$child->getUrl.'\';';
 						}
@@ -252,7 +252,7 @@ sub view {
 					shortcutUrl=>$child->getUrl,
 					showReloadIcon=>$child->{_properties}{showReloadIcon},
 					canPersonalize=>$self->canPersonalize,
-					canEditUserPrefs=>(($self->session->user->profileField("userId") ne '1') && (ref $child eq 'WebGUI::Asset::Shortcut') && (scalar($child->getPrefFieldsToShow) > 0))
+					canEditUserPrefs=>(($self->session->user->userId ne '1') && (ref $child eq 'WebGUI::Asset::Shortcut') && (scalar($child->getPrefFieldsToShow) > 0))
 				});
 				$newStuff .= 'available_dashlets["'.$child->getId.'"]=\''.$child->getUrl.'\';';
 			}
@@ -272,7 +272,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_setContentPositions {
 	my $self = shift;
-	return 'Visitors cannot save settings' if($self->session->user->profileField("userId") eq '1');
+	return 'Visitors cannot save settings' if($self->session->user->userId eq '1');
 	return $self->session->privilege->insufficient() unless ($self->canPersonalize);
 	return 'empty' unless $self->get("isInitialized");
 	my $dummy = $self->initialize unless $self->get("isInitialized");
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index f6d709e68..2329ef93c 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -1052,8 +1052,8 @@ sub www_process {
 	my $entryId = $self->setCollateral("DataForm_entry","DataForm_entryId",{
 		DataForm_entryId=>$self->session->form->process("entryId"),
                 assetId=>$self->getId,
-                userId=>$self->session->user->profileField("userId"),
-                username=>$self->session->user->profileField("username"),
+                userId=>$self->session->user->userId,
+                username=>$self->session->user->username,
                 ipAddress=>$self->session->env->get("REMOTE_ADDR"),
                 submissionDate=$self->session->datetime->time()
 		},0);
diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
index be33c68d4..eb9556970 100644
--- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
@@ -23,7 +23,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 #sub canManage {
 #	my $self = shift;
-#	my $userId = shift || $self->session->user->profileField("userId");
+#	my $userId = shift || $self->session->user->userId;
 #	if ($userId eq $self->getValue("ownerUserId")) {
 #		return 1;
 #	}
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index e976471a9..9eaba375f 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -321,7 +321,7 @@ sub view {
       $var{content} = "<b>Getting <a href='$proxiedUrl'>$proxiedUrl</a> failed</b>".
    	      "<p><i>GET status line: ".$response->status_line."</i>";
    }
-   if ($self->session->user->profileField("userId") eq '1') {
+   if ($self->session->user->userId eq '1') {
       $ttl = $self->get("cacheTimeoutVisitor");
       } else {
           $ttl = $self->get("cacheTimeout");
diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
index 9620fd300..756974932 100644
--- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
@@ -153,7 +153,7 @@ sub view {
 	}
 	else { $var{canViewReport} = 0; }
 	
-	my $statusUserId = $self->session->scratch->get("userId") || $self->session->user->profileField("userId");
+	my $statusUserId = $self->session->scratch->get("userId") || $self->session->user->userId;
 	my $statusListString = $self->getValue("statusList");
 	chop($statusListString);
 	my @statusListArray = split("\n",$statusListString);
@@ -168,7 +168,7 @@ sub view {
 	my ($status) = $self->session->db->quickArray("select status from InOutBoard_status where userId=".$self->session->db->quote($statusUserId)." and assetId=".$self->session->db->quote($self->getId));
 
 	##Find all the users for which I am a delegate
-	my @users = $self->session->db->buildArray("select userId from InOutBoard_delegates where assetId=".$self->session->db->quote($self->getId)." and delegateUserId=".$self->session->db->quote($self->session->user->profileField("userId")));
+	my @users = $self->session->db->buildArray("select userId from InOutBoard_delegates where assetId=".$self->session->db->quote($self->getId)." and delegateUserId=".$self->session->db->quote($self->session->user->userId));
 
 	my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
 	if (@users) {
@@ -202,7 +202,7 @@ sub view {
 		);
 	$f->submit;
 	
-	my ($isInGroup) = $self->session->db->quickArray("select count(*) from groupings where userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and groupId=".$self->session->db->quote($self->get("inOutGroup")));
+	my ($isInGroup) = $self->session->db->quickArray("select count(*) from groupings where userId=".$self->session->db->quote($self->session->user->userId)." and groupId=".$self->session->db->quote($self->get("inOutGroup")));
 	if ($isInGroup) {
 	  $var{displayForm} = 1;
 	  $var{'form'} = $f->print;
@@ -287,7 +287,7 @@ sub www_selectDelegates {
 #left join userProfileData a on users.userId=a.userId and a.fieldName='firstName'
 #left join userProfileData b on users.userId=b.userId and b.fieldName='lastName'
 #where users.userId<>'1' and users.status='Active' and users.userId<>%s
-#group by userId", $self->session->db->quote($self->session->user->profileField("userId"));
+#group by userId", $self->session->db->quote($self->session->user->userId);
     
 	#Comment the sql query below (lines 297 - 307) to show all users of the system in the delegate select list
     my $sql = sprintf "select users.username, 
@@ -300,7 +300,7 @@ left join userProfileData b on users.userId=b.userId and b.fieldName='lastName'
 left join userProfileData c on users.userId=c.userId and c.fieldName='department'
 left join InOutBoard_status on users.userId=InOutBoard_status.userId and InOutBoard_status.assetId=%s
 where users.userId<>'1' and groupings.groupId=InOutBoard.inOutGroup and users.status='Active' and users.userId <> %s and groupings.userId=users.userId and InOutBoard.inOutGroup=%s
-group by userId", $self->session->db->quote($self->getId), $self->session->db->quote($self->session->user->profileField("userId")), $self->session->db->quote($self->getValue("inOutGroup")) ;
+group by userId", $self->session->db->quote($self->getId), $self->session->db->quote($self->session->user->userId), $self->session->db->quote($self->getValue("inOutGroup")) ;
 	my %userNames = ();
 	my $sth = $self->session->db->read($sql);
 	while (my $data = $sth->hashRef) {
@@ -308,7 +308,7 @@ group by userId", $self->session->db->quote($self->getId), $self->session->db->q
 	}
 	$sth->finish;
 	$sql = sprintf "select delegateUserId from InOutBoard_delegates where userId=%s and assetId=%s",
-	                $self->session->db->quote($self->session->user->profileField("userId")), $self->session->db->quote($self->getId);
+	                $self->session->db->quote($self->session->user->userId), $self->session->db->quote($self->getId);
 	my $delegates = $self->session->db->buildArrayRef($sql);
 	my $i18n = WebGUI::International->new($self->session,"Asset_InOutBoard");
         my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
@@ -336,12 +336,12 @@ group by userId", $self->session->db->quote($self->getId), $self->session->db->q
 sub www_selectDelegatesEditSave {
 	my $self = shift;
 	my @delegates = $self->session->form->selectList("delegates");
-	$self->session->db->write("delete from InOutBoard_delegates where assetId=".$self->session->db->quote($self->getId)." and userId=".$self->session->db->quote($self->session->user->profileField("userId")));
+	$self->session->db->write("delete from InOutBoard_delegates where assetId=".$self->session->db->quote($self->getId)." and userId=".$self->session->db->quote($self->session->user->userId));
 
 	foreach my $delegate (@delegates) {
 		$self->session->db->write("insert into InOutBoard_delegates
 		(userId,delegateUserId,assetId) values
-		(".$self->session->db->quote($self->session->user->profileField("userId")).",".$self->session->db->quote($delegate).",".$self->session->db->quote($self->getId).")");
+		(".$self->session->db->quote($self->session->user->userId).",".$self->session->db->quote($delegate).",".$self->session->db->quote($self->getId).")");
 	}
 	return "";
 }
@@ -352,13 +352,13 @@ sub www_setStatus {
 	#$self->session->errorHandler->warn("userId: ".$self->session->scratch->get("userId") ."\n" );
 	if ($self->session->form->process("delegate") eq $self->session->scratch->get("userId")) {
 		#$self->session->errorHandler->warn("Wrote data and removed scratch\n");
-		my $sessionUserId = $self->session->scratch->get("userId") || $self->session->user->profileField("userId");
+		my $sessionUserId = $self->session->scratch->get("userId") || $self->session->user->userId;
 		#$self->session->errorHandler->warn("user Id: ".$sessionUserId."\n");
 		$self->session->scratch->delete("userId");
 		$self->session->db->write("delete from InOutBoard_status where userId=".$self->session->db->quote($sessionUserId)." and  assetId=".$self->session->db->quote($self->getId));
 		$self->session->db->write("insert into InOutBoard_status (assetId,userId,status,dateStamp,message) values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($sessionUserId).","
 			.$self->session->db->quote($self->session->form->process("status")).",".$self->session->datetime->time().",".$self->session->db->quote($self->session->form->process("message")).")");
-		$self->session->db->write("insert into InOutBoard_statusLog (assetId,userId,createdBy,status,dateStamp,message) values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($sessionUserId).",".$self->session->db->quote($self->session->user->profileField("userId")).","
+		$self->session->db->write("insert into InOutBoard_statusLog (assetId,userId,createdBy,status,dateStamp,message) values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($sessionUserId).",".$self->session->db->quote($self->session->user->userId).","
 			.$self->session->db->quote($self->session->form->process("status")).",".$self->session->datetime->time().",".$self->session->db->quote($self->session->form->process("message")).")");
 	}
 	else {
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 3fb5101f9..29abfafbe 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -147,7 +147,7 @@ sub hasRated {
 	return 1 unless ($self->session->user->isInGroup($self->get("groupToRate")));
 	my $ratingTimeout = $self->session->user->isInGroup($self->get("privilegedGroup")) ? $self->get("ratingTimeoutPrivileged") : $self->get("ratingTimeout");
 	my ($hasRated) = $self->session->db->quickArray("select count(*) from Matrix_rating where 
-		((userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and userId<>'1') or (userId='1' and ipAddress=".$self->session->db->quote($self->session->env->get("HTTP_X_FORWARDED_FOR")).")) and 
+		((userId=".$self->session->db->quote($self->session->user->userId)." and userId<>'1') or (userId='1' and ipAddress=".$self->session->db->quote($self->session->env->get("HTTP_X_FORWARDED_FOR")).")) and 
 		listingId=".$self->session->db->quote($listingId)." and timeStamp>".($self->session->datetime->time()-$ratingTimeout));
 	return $hasRated;
 }
@@ -181,7 +181,7 @@ sub setRatings {
 	foreach my $category ($self->getCategories) {
 		if ($ratings->{$category}) {
 			$self->session->db->write("insert into Matrix_rating (userId, category, rating, timeStamp, listingId,ipAddress, assetId) values (
-				".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($category).", ".$self->session->db->quote($ratings->{$category}).", ".$self->session->datetime->time()
+				".$self->session->db->quote($self->session->user->userId).", ".$self->session->db->quote($category).", ".$self->session->db->quote($ratings->{$category}).", ".$self->session->datetime->time()
 				.", ".$self->session->db->quote($listingId).", ".$self->session->db->quote($self->session->env->get("HTTP_X_FORWARDED_FOR")).",".$self->session->db->quote($self->getId).")");
 		}
 		my $sql = "from Matrix_rating where listingId=".$self->session->db->quote($listingId)." and category=".$self->session->db->quote($category);
@@ -442,7 +442,7 @@ sub www_editListing {
         my $self = shift;
         my $listing= $self->session->db->getRow("Matrix_listing","listingId",$self->session->form->process("listingId"));
 	my $i18n = WebGUI::International->new($self->session,'Asset_Matrix');
-	return $i18n->get('no edit rights') unless (($self->session->form->process("listingId") eq "new" && $self->session->user->isInGroup($self->get("groupToAdd"))) || $self->session->user->profileField("userId") eq $listing->{maintainerId} || $self->canEdit);
+	return $i18n->get('no edit rights') unless (($self->session->form->process("listingId") eq "new" && $self->session->user->isInGroup($self->get("groupToAdd"))) || $self->session->user->userId eq $listing->{maintainerId} || $self->canEdit);
         my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
         $f->hidden(
                 -name=>"func",
@@ -572,7 +572,7 @@ sub www_editListingSave {
         my $self = shift;
         my $listing = $self->session->db->getRow("Matrix_listing","listingId",$self->session->form->process("listingId"));
 	my $i18n = WebGUI::International->new($self->session,'Asset_Matrix');
-	return $i18n->get('no edit rights') unless (($self->session->form->process("listingId") eq "new" && $self->session->user->isInGroup($self->get("groupToAdd"))) || $self->session->user->profileField("userId") eq $listing->{maintainerId} || $self->canEdit);
+	return $i18n->get('no edit rights') unless (($self->session->form->process("listingId") eq "new" && $self->session->user->isInGroup($self->get("groupToAdd"))) || $self->session->user->userId eq $listing->{maintainerId} || $self->canEdit);
 	my %data = (
 		listingId => $self->session->form->process("listingId"),
 		lastUpdated => $self->session->datetime->time(),
@@ -585,7 +585,7 @@ sub www_editListingSave {
 		);
 	my $isNew = 0;
 	if ($self->session->form->process("listingId") eq "new") {
-		$data{maintainerId} = $self->session->user->profileField("userId") if ($self->session->form->process("listingId") eq "new");
+		$data{maintainerId} = $self->session->user->userId if ($self->session->form->process("listingId") eq "new");
 		my $forum = $self->addChild({
 			className=>"WebGUI::Asset::Wobject::Collaboration",
 			title=>$self->session->form->process("productName"),
@@ -865,7 +865,7 @@ sub view {
         my (%var);
 	$var{'compare.form'} = $self->getCompareForm;
 	$var{'search.url'} = $self->getUrl("func=search");
-	$var{'isLoggedIn'} = ($self->session->user->profileField("userId") ne "1");
+	$var{'isLoggedIn'} = ($self->session->user->userId ne "1");
 	$var{'field.list.url'} = $self->getUrl('func=listFields');	
 	$var{'listing.add.url'} = $self->formatURL("editListing","new");
 
@@ -981,7 +981,7 @@ sub www_viewDetail {
 	}
 	$var{'edit.url'} = $self->formatURL("editListing",$listingId);
 	$var{id} = $listingId;
-	$var{'user.canEdit'} = ($self->session->user->profileField("userId") eq $listing->{maintainerId} || $self->canEdit);
+	$var{'user.canEdit'} = ($self->session->user->userId eq $listing->{maintainerId} || $self->canEdit);
 	$var{'user.canApprove'} = $self->canEdit;
 	$var{'approve.url'} = $self->getUrl("func=approveListing&listingId=".$listingId."&mlog=".$self->session->form->process("mlog"));
 	$var{'delete.url'} = $self->getUrl("func=deleteListing&listingId=".$listingId."&mlog=".$self->session->form->process("mlog"));
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 0f1143e44..b6f73ca13 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -283,7 +283,7 @@ sub getToolbar {
 			$returnUrl = ";proceed=goBackToPage;returnUrl=".$self->session->url->escape($self->session->asset->getUrl);	
 		}
 		my $toolbar;
-		if (!$self->isLocked || $self->get("isLockedBy") eq $self->session->user->profileField("userId")) {
+		if (!$self->isLocked || $self->get("isLockedBy") eq $self->session->user->userId) {
 			$toolbar = $self->session->icon->edit('func=edit'.$returnUrl,$self->get("url"));
 		}
 		my $i18n = WebGUI::International->new($self->session, "Asset");
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index d6fad4590..6a1dd6e10 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -25,8 +25,8 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 sub _hasVoted {
 	my $self = shift;
 	my ($hasVoted) = $self->session->db->quickArray("select count(*) from Poll_answer 
-		where assetId=".$self->session->db->quote($self->getId)." and ((userId=".$self->session->db->quote($self->session->user->profileField("userId"))."
-		and userId<>'1') or (userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and ipAddress='".$self->session->env->get("REMOTE_ADDR")."'))");
+		where assetId=".$self->session->db->quote($self->getId)." and ((userId=".$self->session->db->quote($self->session->user->userId)."
+		and userId<>'1') or (userId=".$self->session->db->quote($self->session->user->userId)." and ipAddress='".$self->session->env->get("REMOTE_ADDR")."'))");
 	return $hasVoted;
 }
 
@@ -280,7 +280,7 @@ sub view {
         $var{question} = $self->get("question");
 	if ($self->get("active") eq "0") {
 		$showPoll = 0;
-	} elsif ($self->session->user->isInGroup($self->get("voteGroup"),$self->session->user->profileField("userId"))) {
+	} elsif ($self->session->user->isInGroup($self->get("voteGroup"),$self->session->user->userId)) {
 		if ($self->_hasVoted()) {
 			$showPoll = 0;
 		} else {
@@ -324,9 +324,9 @@ sub www_vote {
 	my $self = shift;
 	my $u;
         if ($self->session->form->process("answer") ne "" && $self->session->user->isInGroup($self->get("voteGroup")) && !($self->_hasVoted())) {
-        	$self->setVote($self->session->form->process("answer"),$self->session->user->profileField("userId"),$self->session->env->get("REMOTE_ADDR"));
+        	$self->setVote($self->session->form->process("answer"),$self->session->user->userId,$self->session->env->get("REMOTE_ADDR"));
 		if ($self->session->setting->get("useKarma")) {
-			$u = WebGUI::User->new($self->session->user->profileField("userId"));
+			$u = WebGUI::User->new($self->session->user->userId);
 			$u->karma($self->get("karmaPerVote"),"Poll (".$self->getId.")","Voted on this poll.");
 		}
 		$self->deletePageCache;
diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm
index 504608790..3f6fb3e39 100644
--- a/lib/WebGUI/Asset/Wobject/StockData.pm
+++ b/lib/WebGUI/Asset/Wobject/StockData.pm
@@ -384,7 +384,7 @@ sub view {
 	#Set some template variables
 	$var->{'extrasFolder'} = $self->session->config->get("extrasURL")."/wobject/StockData";
 	$var->{'editUrl'} = $self->getUrl("func=editStocks");
-	$var->{'isVisitor'} = $self->session->user->profileField("userId") eq 1;
+	$var->{'isVisitor'} = $self->session->user->userId eq 1;
 	$var->{'stock.display.url'} = $self->getUrl("func=displayStock&symbol=");
 	
 	#Build list of stocks as an array
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 215d32858..0cdcb5477 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -190,7 +190,7 @@ sub generateResponseId {
 		'Survey_responseId'=>"new",
 		userId=>$userId,
 		ipAddress=>$ipAddress,
-		username=>$self->session->user->profileField("username"),
+		username=>$self->session->user->username,
 		startDate=>$self->session->datetime->time(),
 		'Survey_id'=>$self->get("Survey_id")
 		});
@@ -555,7 +555,7 @@ sub getSequentialQuestionIds {
 #-------------------------------------------------------------------
 sub getUserId {
 	my $self = shift;
-	my $userId = ($self->get("anonymous") && $self->session->user->profileField("userId") != 1) ? substr(md5_hex($self->session->user->profileField("userId")),0,8) : $self->session->user->profileField("userId");
+	my $userId = ($self->get("anonymous") && $self->session->user->userId != 1) ? substr(md5_hex($self->session->user->userId),0,8) : $self->session->user->userId;
 	return $userId;
 }
 
@@ -1167,7 +1167,7 @@ sub www_respond {
 	return "" unless ($self->session->user->isInGroup($self->get("groupToTakeSurvey")));
 	my $varname = $self->getResponseIdString;
 	return "" unless ($self->session->scratch->get($varname));
-	my $userId = ($self->get("anonymous")) ? substr(md5_hex($self->session->user->profileField("userId")),0,8) : $self->session->user->profileField("userId");
+	my $userId = ($self->get("anonymous")) ? substr(md5_hex($self->session->user->userId),0,8) : $self->session->user->userId;
 	my $terminate = 0;
 	foreach my $key (keys %{$session{form}}) {
 		if ($key =~ /^answerId_(.+)$/) {
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index a5f7e449e..c72813178 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -215,7 +215,7 @@ sub www_editBranch {
         my $clause;
         if ($self->session->user->isInGroup(3)) {
                 my $contentManagers = WebGUI::Group->new(4)->getUsers(1);
-                push (@$contentManagers, $self->session->user->profileField("userId"));
+                push (@$contentManagers, $self->session->user->userId);
                 $clause = "userId in (".$self->session->db->quoteAndJoin($contentManagers).")";
         } else {
                 $clause = "userId=".$self->session->db->quote($self->get("ownerUserId"));
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 9318d6c35..087cd5ee4 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -51,7 +51,7 @@ sub cut {
 	return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage"));
 	$self->session->db->beginTransaction;
 	$self->session->db->write("update asset set state='clipboard-limbo' where lineage like ".$self->session->db->quote($self->get("lineage").'%')." and state='published'");
-	$self->session->db->write("update asset set state='clipboard', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged=".$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
+	$self->session->db->write("update asset set state='clipboard', stateChangedBy=".$self->session->db->quote($self->session->user->userId).", stateChanged=".$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
 	$self->session->db->commit;
 	$self->updateHistory("cut");
 	$self->{_properties}{state} = "clipboard";
@@ -104,7 +104,7 @@ If not specified, uses current user.
 sub getAssetsInClipboard {
 	my $self = shift;
 	my $limitToUser = shift;
-	my $userId = shift || $self->session->user->profileField("userId");
+	my $userId = shift || $self->session->user->userId;
 	my @assets;
 	my $limit;
 	if ($limitToUser) {
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index 5a324860c..04cc4fe12 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -95,7 +95,7 @@ sub exportAsHtml {
 
 	# Change the stuff we need to change to do the export
 	my $session = WebGUI::Session->open($self->session->config->getWebguiRoot, $self->session->config->getFilename);
-	$session->user({userId=>$userId}) unless ($userId eq $self->session->user->profileField("userId"));
+	$session->user({userId=>$userId}) unless ($userId eq $self->session->user->userId);
 	$self->{_properties}{cacheTimeout} = $self->{_properties}{cacheTimeoutVisitor} = 1;
 
 	# Generate the page
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 175c80a98..65e23a690 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -58,7 +58,7 @@ sub addChild {
 	$self->{_hasChildren} = 1;
 	$self->session->db->beginTransaction;
 	my $now =$self->session->datetime->time();
-	$self->session->db->write("insert into asset (assetId, parentId, lineage, creationDate, createdBy, className, state) values (".$self->session->db->quote($id).",".$self->session->db->quote($self->getId).", ".$self->session->db->quote($lineage).", ".$now.", ".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($properties->{className}).", 'published')");
+	$self->session->db->write("insert into asset (assetId, parentId, lineage, creationDate, createdBy, className, state) values (".$self->session->db->quote($id).",".$self->session->db->quote($self->getId).", ".$self->session->db->quote($lineage).", ".$now.", ".$self->session->db->quote($self->session->user->userId).", ".$self->session->db->quote($properties->{className}).", 'published')");
 	my $temp = WebGUI::Asset->newByPropertyHashRef({
 		assetId=>$id,
 		className=>$properties->{className}
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index 87d283a43..2ce6edff2 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -54,7 +54,7 @@ If not specified, uses current user.
 sub getAssetsInTrash {
 	my $self = shift;
 	my $limitToUser = shift;
-	my $userId = shift || $self->session->user->profileField("userId");
+	my $userId = shift || $self->session->user->userId;
 	my @assets;
 	my $limit;
 	if ($limitToUser) {
@@ -124,7 +124,7 @@ sub trash {
 	return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage"));
 	$self->session->db->beginTransaction;
 	$self->session->db->write("update asset set state='trash-limbo' where lineage like ".$self->session->db->quote($self->get("lineage").'%'));
-	$self->session->db->write("update asset set state='trash', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged=".$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
+	$self->session->db->write("update asset set state='trash', stateChangedBy=".$self->session->db->quote($self->session->user->userId).", stateChanged=".$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
 	$self->session->db->commit;
 	$self->{_properties}{state} = "trash";
 	$self->updateHistory("trashed");
diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm
index 8f07c0cc1..94e3fb968 100644
--- a/lib/WebGUI/AssetVersioning.pm
+++ b/lib/WebGUI/AssetVersioning.pm
@@ -59,7 +59,7 @@ sub addRevision {
 	my $versionTag = $self->session->scratch->get("versionTag") || 'pbversion0000000000002';
 	my $status = $self->session->setting->get("autoCommit") ? 'approved' : 'pending';
 	$self->session->db->write("insert into assetData (assetId, revisionDate, revisedBy, tagId, status, url, startDate, endDate, 
-		ownerUserId, groupIdEdit, groupIdView) values (".$self->session->db->quote($self->getId).",".$now.", ".$self->session->db->quote($self->session->user->profileField("userId")).", 
+		ownerUserId, groupIdEdit, groupIdView) values (".$self->session->db->quote($self->getId).",".$now.", ".$self->session->db->quote($self->session->user->userId).", 
 		".$self->session->db->quote($versionTag).", ".$self->session->db->quote($status).", ".$self->session->db->quote($self->getId).", 997995720, 32472169200,'3','3','7')");
         foreach my $definition (@{$self->definition}) {
                 unless ($definition->{tableName} eq "assetData") {
@@ -88,12 +88,12 @@ The name of the version tag. If not specified, one will be generated using the c
 
 sub addVersionTag {
 	my $self = shift;
-	my $name = shift || "Autotag created ".$self->session->datetime->epochToHuman()." by ".$self->session->user->profileField("username");
+	my $name = shift || "Autotag created ".$self->session->datetime->epochToHuman()." by ".$self->session->user->username;
 	my $tagId = $self->session->db->setRow("assetVersionTag","tagId",{
 		tagId=>"new",
 		name=>$name,
 		creationDate=>$self->session->datetime->time(),
-		createdBy=>$self->session->user->profileField("userId")
+		createdBy=>$self->session->user->userId
 		});
 	$self->session->scratch->set("versionTag",$tagId);
 	return $tagId;
@@ -111,7 +111,7 @@ Returns a boolean indicating whether this asset is locked and if the current use
 sub canEditIfLocked {
 	my $self = shift;
 	return 0 unless ($self->isLocked);
-	return ($self->get("isLockedBy") eq $self->session->user->profileField("userId"));
+	return ($self->get("isLockedBy") eq $self->session->user->userId);
 }
 
 
@@ -150,7 +150,7 @@ sub commitVersionTag {
 		WebGUI::Asset->new($id,$class,$version)->commit;
 	}
 	$sth->finish;
-	$self->session->db->write("update assetVersionTag set isCommitted=1, commitDate=".$self->session->datetime->time().", committedBy=".$self->session->db->quote($self->session->user->profileField("userId"))." where tagId=".$self->session->db->quote($tagId));
+	$self->session->db->write("update assetVersionTag set isCommitted=1, commitDate=".$self->session->datetime->time().", committedBy=".$self->session->db->quote($self->session->user->userId)." where tagId=".$self->session->db->quote($tagId));
 	$self->session->db->write("delete from userSessionScratch where name='versionTag' and value=".$self->session->db->quote($tagId));
 }
 
@@ -287,7 +287,7 @@ Sets the versioning lock to "on" so that this piece of content may not be edited
 
 sub setVersionLock {
 	my $self = shift;
-	$self->session->db->write("update asset set isLockedBy=".$self->session->db->quote($self->session->user->profileField("userId"))." where assetId=".$self->session->db->quote($self->getId));
+	$self->session->db->write("update asset set isLockedBy=".$self->session->db->quote($self->session->user->userId)." where assetId=".$self->session->db->quote($self->getId));
 	$self->updateHistory("locked");
 	$self->purgeCache;
 }
@@ -328,7 +328,7 @@ If not specified, current user is used.
 sub updateHistory {
 	my $self = shift;
 	my $action = shift;
-	my $userId = shift || $self->session->user->profileField("userId") || '3';
+	my $userId = shift || $self->session->user->userId || '3';
 	my $dateStamp =$self->session->datetime->time();
 	$self->session->db->write("insert into assetHistory (assetId, userId, actionTaken, dateStamp) values (".$self->session->db->quote($self->getId).", ".$self->session->db->quote($userId).", ".$self->session->db->quote($action).", ".$dateStamp.")");
 }
diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm
index f8dffb6af..9cae26303 100644
--- a/lib/WebGUI/Auth.pm
+++ b/lib/WebGUI/Auth.pm
@@ -607,7 +607,7 @@ This object's authentication method
   
 =head3 userId
 
-userId for the user requesting authentication.  This defaults to $self->session->user->profileField("userId")
+userId for the user requesting authentication.  This defaults to $self->session->user->userId
   
 =head3 callable
 
diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index 3de203071..1dce6a26b 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -200,7 +200,7 @@ sub authenticate {
 sub createAccount {
     my $self = shift;
     my $vars;
-    if ($self->session->user->profileField("userId") ne "1") {
+    if ($self->session->user->userId ne "1") {
        return $self->displayAccount;
     } elsif (!$self->session->setting->get("anonymousRegistration")) {
  	   return $self->displayLogin;
diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm
index e93250295..bc71fc161 100644
--- a/lib/WebGUI/Auth/WebGUI.pm
+++ b/lib/WebGUI/Auth/WebGUI.pm
@@ -161,7 +161,7 @@ sub authenticate {
 sub createAccount {
    my $self = shift;
    my $vars;
-   if ($self->session->user->profileField("userId") ne "1") {
+   if ($self->session->user->userId ne "1") {
       return $self->displayAccount;
    } elsif (!$self->session->setting->get("anonymousRegistration")) {
  	  return $self->displayLogin;
@@ -194,7 +194,7 @@ sub createAccount {
 sub createAccountSave {
    my $self = shift;
    
-   return $self->displayAccount if ($self->session->user->profileField("userId") ne "1");
+   return $self->displayAccount if ($self->session->user->userId ne "1");
    
    my $username = $self->session->form->process('authWebGUI.username');
    my $password = $self->session->form->process('authWebGUI.identifier');
diff --git a/lib/WebGUI/Commerce/Payment/ITransact.pm b/lib/WebGUI/Commerce/Payment/ITransact.pm
index a5c564148..92a6da83e 100644
--- a/lib/WebGUI/Commerce/Payment/ITransact.pm
+++ b/lib/WebGUI/Commerce/Payment/ITransact.pm
@@ -106,7 +106,7 @@ sub checkoutForm {
 	
 	$i18n = WebGUI::International->new($self->session, 'CommercePaymentITransact');
 
-	$u = WebGUI::User->new($self->session->user->profileField("userId"));
+	$u = WebGUI::User->new($self->session->user->userId);
 
 	$f = WebGUI::HTMLForm->new($self->session);
 	$f->text(
diff --git a/lib/WebGUI/Commerce/Transaction.pm b/lib/WebGUI/Commerce/Transaction.pm
index 5fb8d0779..e18832137 100644
--- a/lib/WebGUI/Commerce/Transaction.pm
+++ b/lib/WebGUI/Commerce/Transaction.pm
@@ -417,7 +417,7 @@ sub new {
 	my $session = shift;
 	$transactionId = shift;
 	$gatewayId = shift;
-	$userId = shift || $session->user->profileField("userId");
+	$userId = shift || $session->user->userId;
 	
 	if ($transactionId eq 'new') {
 		$transactionId = $session->id->generate;
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index 7e9b2cdb2..401576c94 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -97,7 +97,7 @@ sub toHtml {
         #Remove entries from template list that the user does not have permission to view.
         for my $assetId ( keys %{$templateList} ) {
           	my $asset = WebGUI::Asset::Template->new($assetId);
-          	if (!$asset->canView($self->session->user->profileField("userId"))) {
+          	if (!$asset->canView($self->session->user->userId)) {
             		delete $templateList->{$assetId};
           	}
         }
diff --git a/lib/WebGUI/Macro/At_username.pm b/lib/WebGUI/Macro/At_username.pm
index 8f8199cd2..113b4e29c 100644
--- a/lib/WebGUI/Macro/At_username.pm
+++ b/lib/WebGUI/Macro/At_username.pm
@@ -27,7 +27,7 @@ Macro for displaying the current User's username.
 #-------------------------------------------------------------------
 sub process {
 	my $session = shift;
-	return $session->user->profileField("username");
+	return $session->user->username;
 }
 
 
diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm
index ef6f5dff6..2fae8a8d8 100644
--- a/lib/WebGUI/Macro/L_loginBox.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -66,7 +66,7 @@ sub process {
 	my $templateId = $param[2] || "PBtmpl0000000000000044";
 	my %var;	
 	my $i18n = WebGUI::International->new($session,'Macro_L_loginBox');
-        $var{'user.isVisitor'} = ($session->user->profileField("userId") eq "1");
+        $var{'user.isVisitor'} = ($session->user->userId eq "1");
 	$var{'customText'} = $param[1];
 	$var{'customText'} =~ s/%(.*?)%/_createURL($session,$1)/ge;
 	$var{'hello.label'} = $i18n->get(48);
diff --git a/lib/WebGUI/Macro/LoginToggle.pm b/lib/WebGUI/Macro/LoginToggle.pm
index 835ad5ce6..9e3286594 100644
--- a/lib/WebGUI/Macro/LoginToggle.pm
+++ b/lib/WebGUI/Macro/LoginToggle.pm
@@ -50,7 +50,7 @@ sub process {
         my $login = $param[0] || $i18n->get(716);
         my $logout = $param[1] || $i18n->get(717);
 	my %var;
-        if ($session->user->profileField("userId") eq '1') {
+        if ($session->user->userId eq '1') {
 		return $session->url->page("op=auth;method=init") if ($param[0] eq "linkonly");
         	$var{'toggle.url'} = $session->url->page('op=auth;method=init');
                	$var{'toggle.text'} = $login;
diff --git a/lib/WebGUI/Macro/RandomThread.pm b/lib/WebGUI/Macro/RandomThread.pm
index f44cb8408..1fe1262c7 100644
--- a/lib/WebGUI/Macro/RandomThread.pm
+++ b/lib/WebGUI/Macro/RandomThread.pm
@@ -108,7 +108,7 @@ sub process {
 		}
 	}
 	# If we reach this point, we had no success in finding an asset the user can view:
-	$session->errorHandler->warn("Could not find a random thread that was viewable by the user ".$session->user->profileField("username")." after $numberOfTries tries. Check parameters of macro on page ".$session->asset->get('url'));
+	$session->errorHandler->warn("Could not find a random thread that was viewable by the user ".$session->user->username." after $numberOfTries tries. Check parameters of macro on page ".$session->asset->get('url'));
 	return '';
 }
 
diff --git a/lib/WebGUI/Operation/Auth.pm b/lib/WebGUI/Operation/Auth.pm
index 815d25024..14c46c133 100644
--- a/lib/WebGUI/Operation/Auth.pm
+++ b/lib/WebGUI/Operation/Auth.pm
@@ -33,7 +33,7 @@ sub getInstance {
 	my $session = shift;   
    	#Get Auth Settings
 	my $authMethod = $session->user->authMethod || $session->setting->get("authMethod");
-	$authMethod = $session->setting->get("authMethod") if($session->user->profileField("userId") eq '1');
+	$authMethod = $session->setting->get("authMethod") if($session->user->userId eq '1');
 	$authMethod = $_[0] if($_[0] && isIn($_[0], @{$session->config->get("authMethods")}));
 	my $userId = $_[1];
 	#Create Auth Object
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index f2d90d3d3..9b6338903 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -123,7 +123,7 @@ sub www_checkoutConfirm {
 	$i18n = WebGUI::International->new($session, 'Commerce');
 	
 	# If the user isn't logged in yet, let him do so or have him create an account
-	if ($session->user->profileField("userId") == 1) {
+	if ($session->user->userId == 1) {
 		$session->scratch->set('redirectAfterLogin', $session->url->page('op=checkout'));
 		return WebGUI::Operation::execute('auth');
 	}
@@ -204,7 +204,7 @@ sub www_checkoutSubmit {
 	$i18n = WebGUI::International->new($session, 'Commerce');
 
 	# check if user has already logged in
-	if ($session->user->profileField("userId") == 1) {
+	if ($session->user->userId == 1) {
 		$session->scratch->set('redirectAfterLogin', $session->url->page('op=checkout'));
 		return WebGUI::Operation::execute('displayLogin');
 	}
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 453e3c335..2b8db6f66 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -27,7 +27,7 @@ use WebGUI::Utility;
 sub _hasSecondaryPrivilege {
 	my $session = shift;
 	return 0 unless ($session->user->isInGroup(11));
-	return $group->userIsAdmin($session->user->profileField("userId"),$_[0]);
+	return $group->userIsAdmin($session->user->userId,$_[0]);
 }
 
 
@@ -175,10 +175,10 @@ sub www_addUsersToGroupSave {
 #-------------------------------------------------------------------
 sub www_autoAddToGroup {
 	my $session = shift;
-        return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->profileField("userId") ne 1);
+        return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
 	my $group = WebGUI::Group->new($session->form->process("groupId"));
 	if ($group->autoAdd) {
-		$group->addUsers([$session->user->profileField("userId")],[$session->form->process("groupId")]);
+		$group->addUsers([$session->user->userId],[$session->form->process("groupId")]);
 	}
 	return "";
 }
@@ -186,10 +186,10 @@ sub www_autoAddToGroup {
 #-------------------------------------------------------------------
 sub www_autoDeleteFromGroup {
 	my $session = shift;
-        return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->profileField("userId") ne 1);
+        return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
 	my $group = WebGUI::Group->new($session->form->process("groupId"));
 	if ($group->autoDelete) {
-		$group->deleteUsers([$session->user->profileField("userId")],[$session->form->process("groupId")]);
+		$group->deleteUsers([$session->user->userId],[$session->form->process("groupId")]);
 	}
 	return "";
 }
@@ -241,7 +241,7 @@ perform this operation, and the
 sub www_deleteGrouping {
 	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
-        if (($session->user->profileField("userId") eq $session->form->process("uid") || $session->form->process("uid") eq '3') && $session->form->process("gid") eq '3') {
+        if (($session->user->userId eq $session->form->process("uid") || $session->form->process("uid") eq '3') && $session->form->process("gid") eq '3') {
                 return $session->privilege->vitalComponent();
         }
         my @users = $session->form->selectList('uid');
@@ -565,7 +565,7 @@ sub www_listGroups {
 		return _submenu($output,'',"groups manage");
 	} elsif ($session->user->isInGroup(11)) {
 		my ($output, $p, $sth, @data, @row, $i, $userCount);
-        	my @editableGroups = $session->db->buildArray("select groupId from groupings where userId=".$session->db->quote($session->user->profileField("userId"))." and groupAdmin=1");
+        	my @editableGroups = $session->db->buildArray("select groupId from groupings where userId=".$session->db->quote($session->user->userId)." and groupAdmin=1");
         	push (@editableGroups,0);
         	$sth = $session->db->read("select groupId,groupName,description from groups
                 	where groupId in (".$session->db->quoteAndJoin(\@editableGroups).") order by groupName");
diff --git a/lib/WebGUI/Operation/MessageLog.pm b/lib/WebGUI/Operation/MessageLog.pm
index 6c919ef99..510ec4e4c 100644
--- a/lib/WebGUI/Operation/MessageLog.pm
+++ b/lib/WebGUI/Operation/MessageLog.pm
@@ -55,11 +55,11 @@ Templated display all messages for the current user.
 sub www_viewMessageLog {
 	my $session = shift;
    my (@msg, $vars);
-   return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->profileField("userId")));
+   return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
 	my $i18n = WebGUI::International->new($session);
    $vars->{displayTitle} = '<h1>'.$i18n->get(159).'</h1>';
    my $p = WebGUI::Paginator->new($session,$session->url->page('op=viewMessageLog'));
-   my $query = "select messageLogId,subject,url,dateOfEntry,status from messageLog where userId=".$session->db->quote($session->user->profileField("userId"))." order by dateOfEntry desc";
+   my $query = "select messageLogId,subject,url,dateOfEntry,status from messageLog where userId=".$session->db->quote($session->user->userId)." order by dateOfEntry desc";
    $p->setDataByQuery($query);
    
    $vars->{'message.subject.label'} = $i18n->get(351);
@@ -101,11 +101,11 @@ Templated display of a single message for the user.
 sub www_viewMessageLogMessage {
 	my $session = shift;
    my ($data, $vars);
-   return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->profileField("userId")));
+   return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
 	my $i18n = WebGUI::International->new($session);
    $vars->{displayTitle} = '<h1>'.$i18n->get(159).'</h1>';
    
-   $data = $session->db->quickHashRef("select * from messageLog where messageLogId=".$session->db->quote($session->form->process("mlog"))." and userId=".$session->db->quote($session->user->profileField("userId")));
+   $data = $session->db->quickHashRef("select * from messageLog where messageLogId=".$session->db->quote($session->form->process("mlog"))." and userId=".$session->db->quote($session->user->userId));
    
    $vars->{'message.subject'} = $data->{subject};
    $vars->{'message.dateOfEntry'} =$session->datetime->epochToHuman($data->{dateOfEntry});
diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index 9ba2c13c2..f2ed9d3c7 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -53,7 +53,7 @@ sub getRequiredProfileFields {
 sub isDuplicateEmail {
 	my $session = shift;
 	my $email = shift;
-	my ($otherEmail) = $session->db->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".$session->db->quote($email)." and userId <> ".$session->db->quote($session->user->profileField("userId")));
+	my ($otherEmail) = $session->db->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".$session->db->quote($email)." and userId <> ".$session->db->quote($session->user->userId));
 	return ($otherEmail > 0);
 }
 
@@ -94,7 +94,7 @@ sub validateProfileData {
 #-------------------------------------------------------------------
 sub www_editProfile {
 	my $session = shift;
-	return WebGUI::Operation::Auth::www_auth("init") if($session->user->profileField("userId") eq '1');
+	return WebGUI::Operation::Auth::www_auth("init") if($session->user->userId eq '1');
 	my $i18n = WebGUI::International->new($session);
 	my $vars = {};
 	$vars->{displayTitle} .= '<h1>'.$i18n->get(338).'</h1>';
@@ -103,7 +103,7 @@ sub www_editProfile {
 	$vars->{'profile.form.footer'} = WebGUI::Form::formFooter($session,);
 
 	$vars->{'profile.form.hidden'} = WebGUI::Form::hidden($session,{"name"=>"op","value"=>"editProfileSave"});
-	$vars->{'profile.form.hidden'} .= WebGUI::Form::hidden($session,{"name"=>"uid","value"=>$session->user->profileField("userId")});
+	$vars->{'profile.form.hidden'} .= WebGUI::Form::hidden($session,{"name"=>"uid","value"=>$session->user->userId});
 	my @array = ();
 	foreach my $category (@{WebGUI::ProfileCategory->getCategories}) {
 		next unless $category->isEditable;
@@ -132,14 +132,14 @@ sub www_editProfile {
 sub www_editProfileSave {
 	my $session = shift;
 	my ($profile, $fieldName, $error, $u, $warning);
-	return WebGUI::Operation::Auth::www_auth("init") if ($session->user->profileField("userId") eq '1');
+	return WebGUI::Operation::Auth::www_auth("init") if ($session->user->userId eq '1');
 	
 	($profile, $error, $warning) = validateProfileData();
 	$error .= $warning;
     
 	return www_editProfile('<ul>'.$error.'</ul>') if($error ne "");
     
-	$u = WebGUI::User->new($session->user->profileField("userId"));
+	$u = WebGUI::User->new($session->user->userId);
 	foreach $fieldName (keys %{$profile}) {
 		$u->profileField($fieldName,$profile->{$fieldName});
 	}
@@ -157,7 +157,7 @@ sub www_viewProfile {
 
 	return $session->privilege->notMember() if($u->username eq "");
 
-	return $session->style->userStyle($vars->{displayTitle}.$i18n->get(862)) if($u->profileField("publicProfile") < 1 && ($session->user->profileField("userId") ne $session->form->process("uid") || $session->user->isInGroup(3)));
+	return $session->style->userStyle($vars->{displayTitle}.$i18n->get(862)) if($u->profileField("publicProfile") < 1 && ($session->user->userId ne $session->form->process("uid") || $session->user->isInGroup(3)));
 	return $session->privilege->insufficient() if(!$session->user->isInGroup(2));
 
 	my @array = ();
@@ -174,7 +174,7 @@ sub www_viewProfile {
 		}
 	}
 	$vars->{'profile.elements'} = \@array;
-	if ($session->user->profileField("userId") eq $session->form->process("uid")) {
+	if ($session->user->userId eq $session->form->process("uid")) {
 		$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
 	}
 	return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000052")->process($vars));
diff --git a/lib/WebGUI/Operation/Shared.pm b/lib/WebGUI/Operation/Shared.pm
index 8da82bf41..35f694bbb 100644
--- a/lib/WebGUI/Operation/Shared.pm
+++ b/lib/WebGUI/Operation/Shared.pm
@@ -42,7 +42,7 @@ use Safe;
 	}
 	unless ($session->form->process("op") eq "viewProfile"){
 		my %hash;
-		$hash{'options.display'} = '<a href="'.$session->url->page('op=viewProfile;uid='.$session->user->profileField("userId")).'">'.$i18n->get(343).'</a>';
+		$hash{'options.display'} = '<a href="'.$session->url->page('op=viewProfile;uid='.$session->user->userId).'">'.$i18n->get(343).'</a>';
 		push(@array,\%hash);
 	}
 	unless ($session->form->process("op") eq "viewMessageLog"){
diff --git a/lib/WebGUI/Operation/TransactionLog.pm b/lib/WebGUI/Operation/TransactionLog.pm
index 68a40a72a..eef70bd4a 100644
--- a/lib/WebGUI/Operation/TransactionLog.pm
+++ b/lib/WebGUI/Operation/TransactionLog.pm
@@ -34,7 +34,7 @@ sub www_viewPurchaseHistory {
 
 	$var{errorMessage} = shift;
 	
-	@history = @{WebGUI::Commerce::Transaction->transactionsByUser($session->user->profileField("userId"))};
+	@history = @{WebGUI::Commerce::Transaction->transactionsByUser($session->user->userId)};
 	foreach (@history) {
 		%properties = %{$_->get};
 		$properties{initDate} = $session->datetime->epochToHuman($properties{initDate});
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 16032b4fa..4c2f91ff5 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -313,7 +313,7 @@ sub www_editUser {
 		Deactivated	=>$i18n->get(818),
 		Selfdestructed	=>$i18n->get(819)
 		);
-	if ($u->userId eq $session->user->profileField("userId")) {
+	if ($u->userId eq $session->user->userId) {
 		$tabform->getTab("account")->hidden(
 			-name => "status",
 			-value => $u->status
@@ -365,7 +365,7 @@ sub www_editUser {
 	foreach my $group (@exclude) {
 		unless (
 			$group eq "1" || $group eq "2" || $group eq "7" # can't remove user from magic groups 
-			|| ($session->user->profileField("userId") eq $u->userId  && $group eq 3) # cannot remove self from admin
+			|| ($session->user->userId eq $u->userId  && $group eq 3) # cannot remove self from admin
 			|| ($u->userId eq "3" && $group eq "3") # admin user cannot be remove from admin
 			) {
 			push(@include,$group);
@@ -461,7 +461,7 @@ sub www_editUserKarmaSave {
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($u);
         $u = WebGUI::User->new($session->form->process("uid"));
-        $u->karma($session->form->process("amount"),$session->user->profileField("username")." (".$session->user->profileField("userId").")",$session->form->process("description"));
+        $u->karma($session->form->process("amount"),$session->user->username." (".$session->user->userId.")",$session->form->process("description"));
         return www_editUser();
 }
 
diff --git a/lib/WebGUI/PassiveProfiling.pm b/lib/WebGUI/PassiveProfiling.pm
index c33d9e082..1723076fa 100644
--- a/lib/WebGUI/PassiveProfiling.pm
+++ b/lib/WebGUI/PassiveProfiling.pm
@@ -59,7 +59,7 @@ sub add {
 	my $assetId = shift;
 	my $sql = "insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, assetId, dateOfEntry)
 		     values (".$session->db->quote($session->id->generate()).",".
-				$session->db->quote($session->user->profileField("userId")).",".
+				$session->db->quote($session->user->userId).",".
 				$session->db->quote($session->var->get("sessionId")).",".
 				$session->db->quote($assetId).",".
 				$session->db->quote($session->datetime->time()).")";
diff --git a/lib/WebGUI/Session/Privilege.pm b/lib/WebGUI/Session/Privilege.pm
index d2c0078e6..e8122edf3 100644
--- a/lib/WebGUI/Session/Privilege.pm
+++ b/lib/WebGUI/Session/Privilege.pm
@@ -129,7 +129,7 @@ Returns a message stating that the user does not have the privileges necessary t
 sub noAccess {
 	my $self = shift;
 	$self->session->http->setStatus("401", "No Access");
-   	if ($self->session->user->profileField("userId") eq '1') {
+   	if ($self->session->user->userId eq '1') {
       		return WebGUI::Operation::Auth::www_auth("init");
    	} else {
 		my $i18n = WebGUI::International->new($self->session);
diff --git a/lib/WebGUI/Subscription.pm b/lib/WebGUI/Subscription.pm
index c0fc0fce6..fea22b196 100644
--- a/lib/WebGUI/Subscription.pm
+++ b/lib/WebGUI/Subscription.pm
@@ -54,7 +54,7 @@ specified by the session variable.
 sub apply {
 	my ($self, $userId, $groupId);
 	$self = shift;
-	$userId = shift || $self->session->user->profileField("userId");
+	$userId = shift || $self->session->user->userId;
 	$groupId = $self->{_properties}{subscriptionGroup};
 	my $group = WebGUI::Group->new($self->session,$groupId);
 	# Make user part of the right group