diff --git a/app/controllers/usage_controller.rb b/app/controllers/usage_controller.rb
index 005b1f3..9a65f63 100644
--- a/app/controllers/usage_controller.rb
+++ b/app/controllers/usage_controller.rb
@@ -48,7 +48,7 @@
   def org_statistics
     authorize :usage
 
-    data = Org::MonthlyUsageService.call
+    data = Org::MonthlyUsageService.call(current_user)
     sep = sep_param
     data_csvified = Csvable.from_array_of_hashes(data, true, sep)
 
diff --git a/app/services/org/monthly_usage_service.rb b/app/services/org/monthly_usage_service.rb
index fa406c9..9318c61 100644
--- a/app/services/org/monthly_usage_service.rb
+++ b/app/services/org/monthly_usage_service.rb
@@ -6,20 +6,16 @@
 
     class << self
 
-      def call
-        total = build_from_joined_user
-        build_from_created_plan(total)
-        build_from_shared_plan(total)
-        build_from_exported_plan(total)
+      def call(current_user)
+        total = build_from_joined_user(current_user)
+        build_from_created_plan(current_user, total)
+        build_from_shared_plan(current_user, total)
+        build_from_exported_plan(current_user, total)
         total.values
       end
 
       private
 
-      def current_user
-        User.find_by_email 'xsrust@gmail.com'
-      end
-
       def build_model(month:, new_plans: 0, new_users: 0, downloads: 0, plans_shared: 0)
         {
           month: month,
@@ -45,28 +41,28 @@
         acc
       end
 
-      def build_from_joined_user(total = {})
+      def build_from_joined_user(current_user, total = {})
         joined_users = Stat::StatJoinedUser.monthly_range(org: current_user.org).order(:date)
         joined_users.reduce(total) do |acc, rec|
           reducer_body(acc, rec, :new_users)
         end
       end
 
-      def build_from_created_plan(total = {})
+      def build_from_created_plan(current_user, total = {})
         created_plans = Stat::StatCreatedPlan.monthly_range(org: current_user.org).order(:date)
         created_plans.reduce(total) do |acc, rec|
           reducer_body(acc, rec, :new_plans)
         end
       end
 
-      def build_from_shared_plan(total = {})
+      def build_from_shared_plan(current_user, total = {})
         shared_plans = Stat::StatSharedPlan.monthly_range(org: current_user.org).order(:date)
         shared_plans.reduce(total) do |acc, rec|
           reducer_body(acc, rec, :plans_shared)
         end
       end
 
-      def build_from_exported_plan(total = {})
+      def build_from_exported_plan(current_user, total = {})
         exported_plans = Stat::StatExportedPlan.monthly_range(org: current_user.org).order(:date)
         exported_plans.reduce(total) do |acc, rec|
           reducer_body(acc, rec, :downloads)
diff --git a/app/views/usage/_total_usage.html.erb b/app/views/usage/_total_usage.html.erb
index b893dbf..83fbbf3 100644
--- a/app/views/usage/_total_usage.html.erb
+++ b/app/views/usage/_total_usage.html.erb
@@ -17,8 +17,8 @@
   <% unless current_user.can_super_admin? %>
     <div class="col-md-2"></div>
   <% end %>
-  <div class="col-md-2">
-    <form class="form-inline mt-10 mb-10 pull-right">
+  <div class="col-md-3">
+    <form class="form-inline mt-10 mb-10">
       <label for="csv-field-sep">
         <%= _('csv download field separator') %>:
       </label>