diff --git a/management/reporting/ui/panel-remote-sender-activity.html b/management/reporting/ui/panel-remote-sender-activity.html
index 4877379a..f53b4541 100644
--- a/management/reporting/ui/panel-remote-sender-activity.html
+++ b/management/reporting/ui/panel-remote-sender-activity.html
@@ -28,10 +28,10 @@
       <b-form-radio class="ml-1" v-model="sender_type" value="server" @change="update_recent_list()">Server</b-form-radio>
     </div>
     <b-input-group style="width:40em">
-      <b-form-input v-if="sender_type=='email'" class="h-auto" :autofocus="data_sender===null" list="panel-rsa-recent" v-model="email" placeholder="Enter an email address (envelope FROM)"></b-form-input>
-      <b-form-input v-else class="h-auto" :autofocus="data_sender===null" list="panel-rsa-recent" v-model="server" placeholder="Enter a hostname or ip address"></b-form-input>
+      <b-form-input v-if="sender_type=='email'" class="h-auto" :autofocus="data_sender===null" list="panel-rsa-recent" @change="email_changed" placeholder="Enter an email address (envelope FROM)"></b-form-input>
+      <b-form-input v-else class="h-auto" :autofocus="data_sender===null" list="panel-rsa-recent" @change="server_changed" placeholder="Enter a hostname or ip address"></b-form-input>
       <b-input-group-append>
-        <b-button variant="primary" @click="change_sender" :disabled="sender_type=='email' && (email == '' || email==data_sender) || sender_type=='server' && (server =='' || server==data_sender)">Search</b-button>
+        <b-button variant="primary" @click="change_sender">Search</b-button>
       </b-input-group-append>
     </b-input-group>
     <b-alert variant="warning" class="ml-2" :show="activity && activity.items.length>=get_row_limit()"><sup>*</sup> Tables limited to {{ get_row_limit() }} rows <router-link to="/settings"><b-icon icon="gear-fill"></b-icon></router-link></b-alert>
diff --git a/management/reporting/ui/panel-remote-sender-activity.js b/management/reporting/ui/panel-remote-sender-activity.js
index 8a8c32fc..f4a795d0 100644
--- a/management/reporting/ui/panel-remote-sender-activity.js
+++ b/management/reporting/ui/panel-remote-sender-activity.js
@@ -94,6 +94,14 @@ Vue.component('panel-remote-sender-activity', function(resolve, reject) {
         },
         
         methods: {
+            email_changed: function(evt) {
+                this.email = evt;
+            },
+
+            server_changed: function(evt) {
+                this.server = evt;
+            },
+            
             update_recent_list: function() {
                 this.recent_senders = UserSettings.get()
                     .get_recent_list(this.set_prefix + this.sender_type);
diff --git a/management/reporting/ui/panel-user-activity.html b/management/reporting/ui/panel-user-activity.html
index 5aa272da..d9068a05 100644
--- a/management/reporting/ui/panel-user-activity.html
+++ b/management/reporting/ui/panel-user-activity.html
@@ -6,7 +6,7 @@
 
   <b-form @submit.prevent="getChartData()" class="d-flex">
     <b-input-group class="mb-3" style="width:30em">
-      <b-form-input class="h-auto" :autofocus="data_user_id===null" list="panel-ua-users" v-model="user_id" placeholder="Enter a user id/email address"></b-form-input>
+      <b-form-input class="h-auto" :autofocus="data_user_id===null" list="panel-ua-users" @change="user_id_changed" placeholder="Enter a user id/email address"></b-form-input>
       <b-input-group-append>
         <b-button variant="primary" @click="change_user">Change user</b-button>
       </b-input-group-append>
diff --git a/management/reporting/ui/panel-user-activity.js b/management/reporting/ui/panel-user-activity.js
index c2efe5af..96011a9b 100644
--- a/management/reporting/ui/panel-user-activity.js
+++ b/management/reporting/ui/panel-user-activity.js
@@ -76,6 +76,10 @@ Vue.component('panel-user-activity', function(resolve, reject) {
                     this.$router.replace(route);
                 }
             },
+
+            user_id_changed: function(evt) {
+                this.user_id = evt;
+            },
             
             change_user: function() {
                 this.getChartData(0);