diff --git a/field_group.module b/field_group.module
index fbf3668..00357c3 100644
--- a/field_group.module
+++ b/field_group.module
@@ -1883,9 +1883,12 @@ function field_group_build_entity_groups(&$vars, $type) {
 
   // Put groups inside content if we are rendering an entity_view.
   foreach ($element['#groups'] as $group) {
-    if (!empty($element[$group->group_name])) {
+    if (!empty($element[$group->group_name]) && $type != 'user_profile') {
       $vars['content'][$group->group_name] = $element[$group->group_name];
     }
+    elseif (!empty($element[$group->group_name])) {
+      $vars['user_profile'][$group->group_name] = $element[$group->group_name];
+    }
   }
 
   // New css / js can be attached.
@@ -1939,6 +1942,10 @@ function field_group_fields_nest(&$element, &$vars = NULL) {
         $group_references[$parent_name][$child_name] = $vars['content'][$child_name];
         unset($vars['content'][$child_name]);
       }
+      elseif (!isset($element['#groups'][$child_name]) && isset($vars['user_profile'][$child_name])) {
+        $group_references[$parent_name][$child_name] = $vars['user_profile'][$child_name];
+        unset($vars['user_profile'][$child_name]);
+      }
       // If this is a group, we have to use a reference to keep the reference
       // list intact (but if it is a field we don't mind).
       else {