diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
index 236de82..e3db48f 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
@@ -90,6 +90,10 @@ export default Ember.Controller.extend({
       window.open(this.get('selectedItem.downloadUrl'), "_blank");
     },
 
+    scrollTop() {
+      window.scrollTo(0,0);
+    },
+
     resetParams() {
       this.get('selectedItem').resetParams();
     },
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index f04f685..47cb510 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -145,7 +145,7 @@
           {{#each sortedQueries as |query|}}
             <tr>
               <td>
-                <a href="/admin/plugins/explorer/?id={{query.id}}">
+                <a {{action "scrollTop"}} href="/admin/plugins/explorer/?id={{query.id}}">
                   <b class="query-name">{{query.name}}</b>
                   <br>
                   <medium class="query-desc">{{query.description}}</medium>
diff --git a/plugin.rb b/plugin.rb
index 2c73607..2596d7a 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -941,9 +941,9 @@ SQL
       # guardian.ensure_can_create_explorer_query!
 
       query = DataExplorer::Query.from_hash params.require(:query)
-      query.created_by = current_user.id.to_s
       query.created_at = Time.now.strftime("%b %e, %Y")
-      query.username = current_user.username
+      query.created_by = current_user.id.to_s
+      query.username = User.find(query.created_by).username
       query.id = nil # json import will assign an id, which is wrong
       query.save