diff --git a/backend/src/uxbox/services/mutations/profile.clj b/backend/src/uxbox/services/mutations/profile.clj
index 8d4250bf0..91d2327df 100644
--- a/backend/src/uxbox/services/mutations/profile.clj
+++ b/backend/src/uxbox/services/mutations/profile.clj
@@ -89,7 +89,8 @@
 
 (defn- retrieve-profile-by-email
   [conn email]
-  (db/query-one conn [sql:profile-by-email email]))
+  (-> (db/query-one conn [sql:profile-by-email email])
+      (p/then #(images/resolve-media-uris % [:photo :photo-uri]))))
 
 
 ;; --- Mutation: Update Profile (own)
diff --git a/backend/src/uxbox/services/queries/profile.clj b/backend/src/uxbox/services/queries/profile.clj
index 81c03aa8e..897295aab 100644
--- a/backend/src/uxbox/services/queries/profile.clj
+++ b/backend/src/uxbox/services/queries/profile.clj
@@ -94,4 +94,4 @@
 (defn strip-private-attrs
   "Only selects a publicy visible profile attrs."
   [profile]
-  (select-keys profile [:id :fullname :lang :email :created-at :photo :theme]))
+  (select-keys profile [:id :fullname :lang :email :created-at :photo :theme :photo-uri]))
diff --git a/frontend/src/uxbox/main/data/auth.cljs b/frontend/src/uxbox/main/data/auth.cljs
index 51551c22c..a16d62c56 100644
--- a/frontend/src/uxbox/main/data/auth.cljs
+++ b/frontend/src/uxbox/main/data/auth.cljs
@@ -65,7 +65,7 @@
   (ptk/reify ::clear-user-data
     ptk/UpdateEvent
     (update [_ state]
-      (select-keys state [:route :router :session-id]))
+      (select-keys state [:route :router :session-id :history]))
 
     ptk/WatchEvent
     (watch [_ state s]