diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index c7eb49a7b..8bcc9fb31 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,6 +1,11 @@
 6.8.1
  - Upgraded TinyMCE to 2.0.1, which allows the rich editor to work with
    Firefox 1.5.
+ - Added test class for User.pm (Roy Johnson / Ocean View Web Creations)
+ - Fixed bugs in User.pm not updating _user{lastUpdated} (Roy Johnson /
+   Ocean View Web Creations)
+ - Fixed bugs in User.pm not updating _user{karma} when karma method called
+   (Roy Johnson / Ocean View Web Creations) 
  - Now that we're requiring Perl 5.8, don't need to do the hackery for WS
    Client to work any longer.
  - Fixed a major versioning system bug where when purging the last revision of
diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm
index a9d14356b..0148a9326 100644
--- a/lib/WebGUI/User.pm
+++ b/lib/WebGUI/User.pm
@@ -107,6 +107,7 @@ sub authMethod {
         if (defined $value) {
 		$self->uncache;
                 $self->{_user}{"authMethod"} = $value;
+                $self->{_user}{"lastUpdated"} = time();
                 WebGUI::SQL->write("update users set authMethod=".quote($value).",
 			lastUpdated=".time()." where userId=".quote($self->{_userId}));
         }
@@ -214,6 +215,7 @@ sub karma {
 	my $description = shift;
 	if (defined $amount && defined $source && defined $description) {
 		$self->uncache;
+		$self->{_user}{karma} += $amount;
 		WebGUI::SQL->write("update users set karma=karma+".quote($amount)." where userId=".quote($self->userId));
         	WebGUI::SQL->write("insert into karmaLog values (".quote($self->userId).",$amount,".quote($source).",".quote($description).",".time().")");
 	}
@@ -315,6 +317,7 @@ sub profileField {
 		WebGUI::SQL->write("delete from userProfileData where userId=".quote($self->{_userId})." and fieldName=".quote($fieldName));
 		warn("insert into userProfileData values (".quote($self->{_userId}).", ".quote($fieldName).", ".quote($value).")");
 		WebGUI::SQL->write("insert into userProfileData values (".quote($self->{_userId}).", ".quote($fieldName).", ".quote($value).")");
+		$self->{_user}{"lastUpdated"} = time();
         	WebGUI::SQL->write("update users set lastUpdated=".time()." where userId=".quote($self->{_userId}));
 	}
 	return $self->{_profile}{$fieldName};
@@ -338,6 +341,7 @@ sub referringAffiliate {
         if (defined $value) {
 		$self->uncache;
                 $self->{_user}{"referringAffiliate"} = $value;
+                $self->{_user}{"lastUpdated"} = time();
                 WebGUI::SQL->write("update users set referringAffiliate=".quote($value).",
                         lastUpdated=".time()." where userId=".quote($self->userId));
         }
@@ -362,6 +366,7 @@ sub status {
         if (defined $value) {
 		$self->uncache;
                 $self->{_user}{"status"} = $value;
+                $self->{_user}{"lastUpdated"} = time();
                 WebGUI::SQL->write("update users set status=".quote($value).",
                         lastUpdated=".time()." where userId=".quote($self->userId));
         }
@@ -400,6 +405,7 @@ sub username {
         if (defined $value) {
 		$self->uncache;
                 $self->{_user}{"username"} = $value;
+                $self->{_user}{"lastUpdated"} = time();
                 WebGUI::SQL->write("update users set username=".quote($value).",
                         lastUpdated=".time()." where userId=".quote($self->userId));
         }
diff --git a/t/User.t b/t/User.t
new file mode 100644
index 000000000..6d61748d4
--- /dev/null
+++ b/t/User.t
@@ -0,0 +1,173 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2005 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+# ---- BEGIN DO NOT EDIT ----
+use strict;
+use lib '../lib';
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::Utility;
+# ---- END DO NOT EDIT ----
+
+use WebGUI::User;
+use WebGUI::SQL;
+use Test::More tests => 33; # increment this value for each test you create
+
+initialize();  # this line is required
+
+# put your tests here
+my $user;
+my $lastUpdate;
+
+#Let's try to create a new user and make sure we get an object back
+my $userCreationTime = time();
+ok(defined ($user = WebGUI::User->new("new")), 'new("new") -- object reference is defined');
+
+#New does not return undef if something breaks, so we'll see if the _profile hash was set.
+ok(scalar %{$user->{_profile}} > 0, 'new("new") -- profile property contains at least one key');  
+
+#Let's assign a username
+$lastUpdate = time();
+$user->username("bill_lumberg");
+is($user->username, "bill_lumberg", 'username() method');
+is($user->lastUpdated, $lastUpdate, 'lastUpdated() -- username change');
+
+#Let's check the UID and make sure it's sane
+ok($user->userId =~ m/[A-Za-z0-9\-\_]{22}/, 'userId() returns sane value');
+
+#Let's check the status method
+$lastUpdate = time();
+$user->status('Active');
+is($user->status, "Active", 'status("Active")');
+is($user->lastUpdated, $lastUpdate, 'lastUpdated() -- status change');
+
+$user->status('Selfdestructed');
+is($user->status, "Selfdestructed", 'status("Selfdestructed")');
+
+$user->status('Deactivated');
+is($user->status, "Deactivated", 'status("Deactivated")');
+
+#Let's get/set a profile field
+$lastUpdate = time();
+$user->profileField("firstName", "Bill");
+is($user->profileField("firstName"), "Bill", 'profileField() get/set');
+is($user->lastUpdated, $lastUpdate, 'lastUpdated() -- profileField');
+
+#Let's check the auth methods
+
+#Default should be WebGUI
+is($user->authMethod, "WebGUI", 'authMethod() -- default value is WebGUI');
+
+#Try changing to LDAP
+$lastUpdate = time();
+$user->authMethod("LDAP");
+is($user->authMethod, "LDAP", 'authMethod() -- set to LDAP');
+is($user->lastUpdated, $lastUpdate, 'lastUpdated() -- authmethod change');
+
+#See if datecreated is correct
+is($user->dateCreated, $userCreationTime, 'dateCreated()');
+
+#get/set karma
+my $oldKarma = $user->karma;
+$user->karma('69', 'peter gibbons', 'test karma');
+is($user->karma, $oldKarma+69, 'karma() -- get/set add amount');
+
+my ($source, $description) = WebGUI::SQL->quickArray("select source, description from karmaLog where userId=".quote($user->userId));
+
+is($source, 'peter gibbons', 'karma() -- get/set source');
+is($description, 'test karma', 'karma() -- get/set description');
+
+$oldKarma = $user->karma;
+$user->karma('-69', 'peter gibbons', 'lumberg took test karma away');
+is($user->karma, $oldKarma-69, 'karma() -- get/set subtract amount');
+
+#Let's test referringAffiliate
+$lastUpdate = time();
+$user->referringAffiliate(10);
+is($user->referringAffiliate, '10', 'referringAffiliate() -- get/set');
+is($user->lastUpdated, $lastUpdate, 'lastUpdated() -- referringAffiliate');
+
+#Let's try adding this user to some groups
+my @groups = qw|2 4|;
+$user->addToGroups(\@groups);
+
+my ($result) = WebGUI::SQL->quickArray("select count(*) from groupings where groupId=".quote('2')." and userId=".quote($user->userId));
+ok($result, 'addToGroups() -- added to first test group');
+
+($result) = WebGUI::SQL->quickArray("select count(*) from groupings where groupId=".quote('4')." and userId=".quote($user->userId));
+ok($result, 'addToGroups() -- added to second test group');
+
+#Let's delete this user from our test groups
+$user->deleteFromGroups(\@groups);
+
+($result) = WebGUI::SQL->quickArray("select count(*) from groupings where groupId=".quote('2')." and userId=".quote($user->userId));
+is($result, '0', 'deleteFromGroups() -- removed from first test group');
+
+($result) = WebGUI::SQL->quickArray("select count(*) from groupings where groupId=".quote('4')." and userId=".quote($user->userId));
+is($result, '0', 'deleteFromGroups() -- removed from second test group');
+
+#Let's delete this user
+my $userId = $user->userId;
+$user->delete;
+
+my ($count) = WebGUI::SQL->quickArray("select count(*) from users where userId=".quote($userId));
+is($count, '0', 'delete() -- users table');
+
+($count) = WebGUI::SQL->quickArray("select count(*) from userProfileData where userId=".quote($userId));
+is($count, '0', 'delete() -- userProfileData table');
+
+($count) = WebGUI::SQL->quickArray("select count(*) from messageLog where userId=".quote($userId));
+is($count, '0', 'delete() -- messageLog table'); 
+
+#Let's test new with an override uid
+$user = WebGUI::User->new("new", "ROYSUNIQUEUSERID000001");
+is($user->userId, "ROYSUNIQUEUSERID000001", 'new() -- override user id');
+$user->delete;
+
+#Let's test new to retrieve an existing user
+$user = WebGUI::User->new(3);
+is($user->username, "Admin", 'new() -- retrieve existing user');
+$user = "";
+
+#Let's test new to retrieve default user visitor with no params passed in
+$user = WebGUI::User->new;
+is($user->userId, '1', 'new() -- returns visitor with no args');
+$user = "";
+
+#identifier() and uncache()
+SKIP: {
+  skip("identifier() -- deprecated",1);
+  ok(undef, "identifier()");
+}
+
+SKIP: {
+  skip("uncache() -- Don't know how to test uncache()",1);
+  ok(undef, "uncache");
+}
+
+cleanup(); # this line is required
+
+
+# ---- DO NOT EDIT BELOW THIS LINE -----
+
+sub initialize {
+	$|=1; # disable output buffering
+	my $configFile;
+	GetOptions(
+        	'configFile=s'=>\$configFile
+	);
+	exit 1 unless ($configFile);
+	WebGUI::Session::open("..",$configFile);
+}
+
+sub cleanup {
+	WebGUI::Session::close();
+}
+