diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index b49af1910..906db6502 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -1343,7 +1343,7 @@ sub www_sendMessageSave {
         my $user = WebGUI::User->new($session, $uid);
         
         # Sender only gets CCd on inbox message (not real email)
-        my $isSender = $uid == $session->user->userId;
+        my $isSender = $uid eq $session->user->userId;
         $messageOptions->{no_email} = 1 if $isSender;
         
         # Optionally set SMS notification details (excluding sender)
diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm
index 05afa6560..210bccb25 100644
--- a/lib/WebGUI/Asset/File/GalleryFile.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile.pm
@@ -241,7 +241,7 @@ sub canView {
     my $album       = $self->getParent;
     return 0 unless $album->canView($userId);
 
-    if ($self->isFriendsOnly && $userId != $self->get("ownerUserId") ) {
+    if ($self->isFriendsOnly && $userId ne $self->get("ownerUserId") ) {
         my $owner       = WebGUI::User->new( $self->session, $self->get("ownerUserId") );
         return 0
             unless WebGUI::Friends->new($self->session, $owner)->isFriend($userId);
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index c13acdbb8..d12945e50 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -2217,7 +2217,7 @@ sub canTakeSurvey {
     my $userId              = $self->session->user->userId();
     my $takenCount          = 0;
 
-    if ( $userId == 1 ) {
+    if ( $userId eq 1 ) {
         $takenCount = $self->takenCount( { ipAddress => $ip });
     }
     else {
diff --git a/lib/WebGUI/Macro/UsersOnline.pm b/lib/WebGUI/Macro/UsersOnline.pm
index a37ac649f..b1cdf1340 100644
--- a/lib/WebGUI/Macro/UsersOnline.pm
+++ b/lib/WebGUI/Macro/UsersOnline.pm
@@ -100,7 +100,7 @@ sub process {
 	# Calculate the total number of active users
 	$var{'total'} = $var{'members'} + $var{'visitors'};
 	# Set some flags
-   	$var{'isVisitor'} = 1 if ($session->user->userId == 1);
+   	$var{'isVisitor'} = 1 if ($session->user->userId eq 1);
 	$var{'hasMembers'} = 1 if $var{'member_loop'};
 
 	# Assign labels