diff --git a/browser/main/Components/PlanetHeader.jsx b/browser/main/Components/PlanetHeader.jsx
index 270e1668..4150352f 100644
--- a/browser/main/Components/PlanetHeader.jsx
+++ b/browser/main/Components/PlanetHeader.jsx
@@ -20,7 +20,7 @@ var PlanetHeader = React.createClass({
   },
   render: function () {
     var currentPlanetName = this.props.currentPlanet.name
-    var currentUserName = this.props.currentUser.name
+    var currentUserName = this.props.currentPlanet.userName
 
     return (
       <div onClick={this.interceptClick} className='PlanetHeader'>
diff --git a/browser/main/Containers/PlanetContainer.jsx b/browser/main/Containers/PlanetContainer.jsx
index 50d68f98..a9f0a8e1 100644
--- a/browser/main/Containers/PlanetContainer.jsx
+++ b/browser/main/Containers/PlanetContainer.jsx
@@ -62,14 +62,14 @@ module.exports = React.createClass({
   componentDidMount: function () {
     this.unsubscribe = PlanetStore.listen(this.onFetched)
 
-    PlanetActions.fetchPlanet(this.props.params.userName + '/' + this.props.params.planetName)
+    PlanetActions.fetchPlanet(this.props.params.userName, this.props.params.planetName)
   },
   componentWillUnmount: function () {
     this.unsubscribe()
   },
   componentDidUpdate: function () {
-    if (this.state.currentPlanet.planetName !== this.props.params.planetName) {
-      PlanetActions.fetchPlanet(this.props.params.userName + '/' + this.props.params.planetName)
+    if (this.state.currentPlanet.name !== this.props.params.planetName || this.state.currentPlanet.userName !== this.props.params.userName) {
+      PlanetActions.fetchPlanet(this.props.params.userName, this.props.params.planetName)
     }
   },
   getFilteredIndexOfCurrentArticle: function () {
@@ -287,7 +287,6 @@ module.exports = React.createClass({
     var searchInput = React.findDOMNode(this).querySelector('.PlanetHeader .searchInput input')
 
     if (document.activeElement === searchInput) {
-      console.log('fff', e.keyCode)
       switch (e.keyCode) {
         case 38:
           this.focus()
diff --git a/browser/main/Stores/PlanetStore.js b/browser/main/Stores/PlanetStore.js
index 04616a1d..fd67183a 100644
--- a/browser/main/Stores/PlanetStore.js
+++ b/browser/main/Stores/PlanetStore.js
@@ -42,9 +42,9 @@ var PlanetStore = Reflux.createStore({
         })
       }.bind(this))
   },
-  fetchPlanet: function (planetName) {
+  fetchPlanet: function (userName, planetName) {
     request
-      .get(apiUrl + planetName)
+      .get(apiUrl + userName + '/' + planetName)
       .send()
       .end(function (err, res) {
         if (err) {
@@ -54,6 +54,8 @@ var PlanetStore = Reflux.createStore({
         }
 
         var planet = res.body
+        planet.userName = userName
+
         planet.Snippets = planet.Snippets.map(function (snippet) {
           snippet.type = 'snippet'
           return snippet