diff --git a/page_manager/plugins/tasks/user_edit.inc b/page_manager/plugins/tasks/user_edit.inc
index 6d0135d..41b67cc 100644
--- a/page_manager/plugins/tasks/user_edit.inc
+++ b/page_manager/plugins/tasks/user_edit.inc
@@ -119,7 +119,7 @@ function page_manager_user_edit_page($account, $category = 'account') {
     //call drupal_build_form.
     $form_state = array();
     $form_id = 'user_profile_form';
-    $args = array($account);
+    $args = array($account, $category);
     $form_state['build_info']['args'] = $args;
     form_load_include($form_state, 'inc', 'user', 'user.pages');
     $output = drupal_build_form($form_id, $form_state);
diff --git a/plugins/contexts/user_edit_form.inc b/plugins/contexts/user_edit_form.inc
index da0cca0..0f92058 100644
--- a/plugins/contexts/user_edit_form.inc
+++ b/plugins/contexts/user_edit_form.inc
@@ -34,6 +34,10 @@ function ctools_context_create_user_edit_form($empty, $user = NULL, $conf = FALS
   $category = !empty($conf['category']) ? $conf['category'] : FALSE;
   unset($conf['category']);
 
+  if (!$category && isset($user->user_category)) {
+    $category = $user->user_category;
+  }
+
   // Return previously created contexts, per category.
   static $created = array();
   if (!empty($created[$category])) {