diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php
index 5ccd46aeb574d..1254c93bcec74 100644
--- a/components/com_users/models/profile.php
+++ b/components/com_users/models/profile.php
@@ -393,16 +393,19 @@ public function save($data)
 		JPluginHelper::importPlugin('user');
 
 		// Null the user groups so they don't get overwritten
+		$groups = $user->groups;
 		$user->groups = null;
 
 		// Store the data.
 		if (!$user->save())
 		{
+			$user->groups = $groups;
 			$this->setError($user->getError());
 
 			return false;
 		}
 
+		$user->groups = $groups;
 		$user->tags = new JHelperTags;
 		$user->tags->getTagIds($user->id, 'com_users.user');