diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index fa1d2c9a7..3d99d92c5 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
  - fix: SQL Report: Paginate After (Still) (William McKee / Knowmad
    Technologies)
  - fix: Bug in thumbnailer.pl
+ - fix: EMS: Adding badges for others
  - fix: Events userDefined fields now work.
  - fix: Bug in thumbnailer.pl revisited ("guiuser")
 
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index 6d457f578..9f84314d7 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -2695,15 +2695,15 @@ sub www_saveRegistrantInfo {
 	$userId = $theirUserId unless $thisIsI;
 	if ($userId && $userId ne '1') {
 		my $u = WebGUI::User->new($self->session,$userId);
-		$u->profileField('firstName',$firstName);
-		$u->profileField('lastName',$lastName);
-		$u->profileField('homeAddress',$address);
-		$u->profileField('homeCity',$city);
-		$u->profileField('homeState',$state);
-		$u->profileField('homeZip',$zipCode);
-		$u->profileField('homeCountry',$country);
-		$u->profileField('homePhone',$phoneNumber);
-		$u->profileField('email',$email);
+		$u->profileField('firstName',$firstName) if ($firstName ne "");
+		$u->profileField('lastName',$lastName) if ($lastName ne "");
+		$u->profileField('homeAddress',$address) if ($address ne "");
+		$u->profileField('homeCity',$city) if ($city ne "");
+		$u->profileField('homeState',$state) if ($state ne "");
+		$u->profileField('homeZip',$zipCode) if ($zipCode ne "");
+		$u->profileField('homeCountry',$country) if ($country ne "");
+		$u->profileField('homePhone',$phoneNumber) if ($phoneNumber ne "");
+		$u->profileField('email',$email) if ($email ne "");
 	}
 
 	$self->session->scratch->set('currentBadgeId',$badgeId);
@@ -3582,15 +3582,15 @@ sub www_editRegistrantSave {
 			$u = WebGUI::User->new($self->session,$userId);
 		}
 		if (ref($u) eq 'WebGUI::User') {
-			$u->profileField('firstName',$firstName);
-			$u->profileField('lastName',$lastName);
-			$u->profileField('homeAddress',$address);
-			$u->profileField('homeCity',$city);
-			$u->profileField('homeState',$state);
-			$u->profileField('homeZip',$zipCode);
-			$u->profileField('homeCountry',$country);
-			$u->profileField('homePhone',$phoneNumber);
-			$u->profileField('email',$email);
+			$u->profileField('firstName',$firstName) if ($firstName ne "");
+                	$u->profileField('lastName',$lastName) if ($lastName ne "");
+                	$u->profileField('homeAddress',$address) if ($address ne "");
+                	$u->profileField('homeCity',$city) if ($city ne "");
+                	$u->profileField('homeState',$state) if ($state ne "");
+                	$u->profileField('homeZip',$zipCode) if ($zipCode ne "");
+                	$u->profileField('homeCountry',$country) if ($country ne "");
+                	$u->profileField('homePhone',$phoneNumber) if ($phoneNumber ne "");
+                	$u->profileField('email',$email) if ($email ne "");
 		}
 	}
 	return $self->www_manageRegistrants();