diff --git a/lib/issues_save_hook_listener.rb b/lib/issues_save_hook_listener.rb
index 21ed03d..348ed34 100644
--- a/lib/issues_save_hook_listener.rb
+++ b/lib/issues_save_hook_listener.rb
@@ -78,8 +78,8 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
     if spent_hours > 0 then
     
       # Prepare to create a new Time Activity
-      time_service = Quickbooks::Service::TimeActivity.new(:company_id => Qbo.get_realm_id, :access_token => Qbo.get_auth_token)
-      item_service = Quickbooks::Service::Item.new(:company_id => Qbo.get_realm_id, :access_token => Qbo.get_auth_token)
+      time_service = Quickbooks::Base.new(Qbo.get_account, :time_activity).service
+      item_service = Quickbooks::Base.new(Qbo.get_account, :item).service
       time_entry = Quickbooks::Model::TimeActivity.new
     
       # Convert float spent time to hours and minutes
diff --git a/lib/issues_show_hook_listener.rb b/lib/issues_show_hook_listener.rb
index ed8f45f..4845e04 100644
--- a/lib/issues_show_hook_listener.rb
+++ b/lib/issues_show_hook_listener.rb
@@ -34,6 +34,7 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     unless (issue.qbo_estimate.nil?)
       QboEstimate.update(issue.qbo_estimate.id)
       @estimate =  issue.qbo_estimate.doc_number
+      @link = link_to @estimate, qbo_estimate_pdf_path(issue.qbo_estimate.id)
     end
     
     return "<div class=\"attributes\">
@@ -49,7 +50,7 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
   
     <div class=\"qbo_estimate_id attribute\">
         <div class=\"label\"><span>Estimate</span>:</div>
-        <div class=\"value\">#{link_to @estimate, qbo_estimate_pdf_path(issue.qbo_estimate.id)}</div>
+        <div class=\"value\">#{@link}</div>
     </div>
     </div>"
   end