diff --git a/core/client/router.js b/core/client/router.js
index 485b96ca41..1e3c906f03 100755
--- a/core/client/router.js
+++ b/core/client/router.js
@@ -4,7 +4,7 @@
 var Router = Ember.Router.extend();
 
 Router.reopen({
-    //location: 'history', // use HTML5 History API instead of hash-tag based URLs
+    location: 'history', // use HTML5 History API instead of hash-tag based URLs
     rootURL: '/ghost/ember/' // admin interface lives under sub-directory /ghost
 });
 
diff --git a/core/server/routes/admin.js b/core/server/routes/admin.js
index e023eadf8e..b433d49432 100644
--- a/core/server/routes/admin.js
+++ b/core/server/routes/admin.js
@@ -58,5 +58,5 @@ module.exports = function (server) {
     });
     server.get('/ghost/', admin.indexold);
 
-    server.get('/ghost/ember/', admin.index);
+    server.get('/ghost/ember/*', admin.index);
 };
\ No newline at end of file