diff --git a/app/controllers/user.js b/app/controllers/user.js
index 1f576f4..7da7bba 100644
--- a/app/controllers/user.js
+++ b/app/controllers/user.js
@@ -64,7 +64,7 @@ class UserController extends SiteController {
     router.param('coreUserId', this.populateCoreUser.bind(this));
 
     router.post(
-      '/core/:userId/settings',
+      '/core/:coreUserId/settings',
       limiterService.create(limiterService.config.user.postUpdateCoreSettings),
       checkProfileOwner,
       upload.none(),
diff --git a/app/views/user/components/profile-icon.pug b/app/views/user/components/profile-icon.pug
index 9d440e5..95c6628 100644
--- a/app/views/user/components/profile-icon.pug
+++ b/app/views/user/components/profile-icon.pug
@@ -1,5 +1,5 @@
 mixin renderProfileIcon (user, title, size)
-  if user.core
+  if user.coreUserId
     img(
       src=`http://${user.core.meta.domain}/core/user/${user.coreUserId}/picture?s=${size || 'small'}`,
       title= title,