diff --git a/src/gnome-utils/window-main-summarybar.c b/src/gnome-utils/window-main-summarybar.c
index 74b5372e39..d6ac2e6252 100644
--- a/src/gnome-utils/window-main-summarybar.c
+++ b/src/gnome-utils/window-main-summarybar.c
@@ -385,8 +385,14 @@ gnc_main_window_summary_refresh (GNCMainSummary * summary)
     GList *current;
     GNCSummarybarOptions options;
 
-    options.default_currency = gnc_default_report_currency ();
 
+    root = gnc_get_current_root_account ();
+    options.default_currency = xaccAccountGetCommodity(root);
+    if(options.default_currency == NULL)
+    {	
+      options.default_currency = gnc_default_currency ();
+    }
+  
     options.euro = gnc_gconf_get_bool(GCONF_GENERAL, KEY_ENABLE_EURO, NULL);
     options.grand_total =
         gnc_gconf_get_bool(GCONF_SECTION, KEY_GRAND_TOTAL, NULL);
@@ -407,7 +413,6 @@ gnc_main_window_summary_refresh (GNCMainSummary * summary)
     gnc_ui_get_currency_accumulator (&currency_list, options.default_currency,
                                      TOTAL_SINGLE);
 
-    root = gnc_get_current_root_account ();
     gnc_ui_accounts_recurse(root, &currency_list, options);
 
     {
diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c
index 8a50576474..c81793f583 100644
--- a/src/gnome/assistant-hierarchy.c
+++ b/src/gnome/assistant-hierarchy.c
@@ -1009,13 +1009,18 @@ on_finish (GtkAssistant  *gtkassistant,
            hierarchy_data  *data)
 {
     GncHierarchyAssistantFinishedCallback when_completed;
+    gnc_commodity *com;
+    Account * root;
     ENTER (" ");
-
+    com = gnc_currency_edit_get_currency (GNC_CURRENCY_EDIT(data->currency_selector));
+    
     if (data->our_account_tree)
     {
         gnc_account_foreach_descendant (data->our_account_tree,
                                         (AccountCb)starting_balance_helper,
                                         data);
+    
+      
     }
 
     // delete before we suspend GUI events, and then muck with the model,
@@ -1027,12 +1032,17 @@ on_finish (GtkAssistant  *gtkassistant,
     gnc_suspend_gui_refresh ();
 
     account_trees_merge(gnc_get_current_root_account(), data->our_account_tree);
-
+    
     delete_our_account_tree (data);
 
     when_completed = data->when_completed;
     g_free(data);
+    
+    root = gnc_get_current_root_account();
+    xaccAccountSetCommodity(root, com);
+    
     gnc_resume_gui_refresh ();
+    
     if (when_completed)
     {
         (*when_completed)();