diff --git a/lib/CXGN/BrAPI/v2/ObservationVariables.pm b/lib/CXGN/BrAPI/v2/ObservationVariables.pm
index 86199d4271..a8aa928b2b 100644
--- a/lib/CXGN/BrAPI/v2/ObservationVariables.pm
+++ b/lib/CXGN/BrAPI/v2/ObservationVariables.pm
@@ -251,9 +251,8 @@ sub get_query {
     my @data_files;
 
     if ($array) {
-        my $data_window;
-        ($data_window, $pagination) = CXGN::BrAPI::Pagination->paginate_array(\@variables, $page_size, $page);
-        %result = (data => $data_window);
+        my %result = (data=>\@variables);
+        my $pagination = CXGN::BrAPI::Pagination->pagination_response($total_count,$page_size,$page);
         return CXGN::BrAPI::JSONResponse->return_success(\%result, $pagination, \@data_files, $status, 'Observationvariable search result constructed');
     } else {
         $pagination = CXGN::BrAPI::Pagination->pagination_response($total_count,$page_size,$page);
diff --git a/lib/SGN/Controller/AJAX/BrAPI.pm b/lib/SGN/Controller/AJAX/BrAPI.pm
index 4ba22f2559..54bd331d3d 100644
--- a/lib/SGN/Controller/AJAX/BrAPI.pm
+++ b/lib/SGN/Controller/AJAX/BrAPI.pm
@@ -206,10 +206,11 @@ sub _authenticate_user {
 		$server_permission{$wildcard} = 1;
 	}
 
+	($user_id, $user_type, $user_pref, $expired) = CXGN::Login->new($c->dbc->dbh)->query_from_cookie($c->stash->{session_token});
+
 	# If our brapi config is set to authenticate or the controller calling this asks for forcing of
 	# authentication or serverinfo call method request auth, we authenticate.
     if ($c->config->{brapi_require_login} == 1 || $force_authenticate || !exists($server_permission{$wildcard})){
-        ($user_id, $user_type, $user_pref, $expired) = CXGN::Login->new($c->dbc->dbh)->query_from_cookie($c->stash->{session_token});
         #print STDERR $user_id." : ".$user_type." : ".$expired;
 
         if (!$user_id || $expired || !$user_type || (!exists($server_permission{$user_type}) && !exists($server_permission{$wildcard}))) {
@@ -3313,7 +3314,6 @@ sub observationvariable_list_POST {
 	my $self = shift;
 	my $c = shift;
 	my ($auth,$user_id) = _authenticate_user($c);
-	my $user_id;
 
 	my $response;
 	try {
@@ -3326,7 +3326,7 @@ sub observationvariable_list_POST {
 
 		my $brapi = $self->brapi_module;
 		my $brapi_module = $brapi->brapi_wrapper('ObservationVariables');
-		$response = $brapi_module->store(\@all_variables,$user_id, $c);
+		$response = $brapi_module->store(\@all_variables, $c);
 	} catch {
 		if ($_->isa('CXGN::BrAPI::Exceptions::ConflictException')){
 			my $error = CXGN::BrAPI::JSONResponse->return_error([], $_->message);
@@ -3382,7 +3382,6 @@ sub observationvariable_detail_PUT {
 	my $c = shift;
 	my $variableDbId = shift;
 	my ($auth,$user_id) = _authenticate_user($c);
-	my $user_id;
 
 	my $response;
 	try {
@@ -3393,7 +3392,7 @@ sub observationvariable_detail_PUT {
 
 		my $brapi = $self->brapi_module;
 		my $brapi_module = $brapi->brapi_wrapper('ObservationVariables');
-		$response = $brapi_module->update($data,$user_id,$c);
+		$response = $brapi_module->update($data,$c);
 	} catch {
 		warn Dumper($_);
 		if ($_->isa('CXGN::BrAPI::Exceptions::NotFoundException')){