diff --git a/core/client/routes/settings/users/user.js b/core/client/routes/settings/users/user.js
index 395fbf597a..894a509a2f 100644
--- a/core/client/routes/settings/users/user.js
+++ b/core/client/routes/settings/users/user.js
@@ -1,11 +1,18 @@
 var SettingsUserRoute = Ember.Route.extend({
     model: function (params) {
+        var self = this;
         // TODO: Make custom user adapter that uses /api/users/:slug endpoint
         // return this.store.find('user', { slug: params.slug });
 
         // Instead, get all the users and then find by slug
         return this.store.find('user').then(function (result) {
-            return result.findBy('slug', params.slug);
+            var user = result.findBy('slug', params.slug);
+
+            if (!user) {
+                return self.transitionTo('error404', 'settings/users/' + params.slug);
+            }
+
+            return user;
         });
     },