diff --git a/frappe/public/js/frappe/social/components/Post.vue b/frappe/public/js/frappe/social/components/Post.vue
index 97489d012c..1bd5953ff5 100644
--- a/frappe/public/js/frappe/social/components/Post.vue
+++ b/frappe/public/js/frappe/social/components/Post.vue
@@ -39,13 +39,6 @@ export default {
 		PostAction,
 		PostComment
 	},
-	mounted() {
-		this.$el.querySelectorAll('img').forEach((img) => {
-			img.addEventListener('click', () => {
-				this.$root.$emit('show_preview', img.src);
-			})
-		});
-	},
 	data() {
 		return {
 			user_avatar: frappe.avatar(this.post.owner, 'avatar-medium'),
@@ -93,12 +86,17 @@ export default {
 
 	},
 	mounted() {
-		Array.from(this.$refs['content'].getElementsByTagName("a"))
-			.forEach(link_element => {
-				// to open link in new tab
-				link_element.target = 'blank';
-				this.generate_preview(link_element);
+		this.$refs['content'].querySelectorAll('img').forEach((img) => {
+			img.addEventListener('click', () => {
+				this.$root.$emit('show_preview', img.src);
 			})
+		});
+
+		this.$refs['content'].querySelectorAll('a').forEach(link_element => {
+			// to open link in new tab
+			link_element.target = 'blank';
+			this.generate_preview(link_element);
+		})
 	},
 	methods: {
 		goto_profile(user) {
diff --git a/frappe/public/js/frappe/social/social_home.js b/frappe/public/js/frappe/social/social_home.js
index ae0c8e88e2..d83fca1ba3 100644
--- a/frappe/public/js/frappe/social/social_home.js
+++ b/frappe/public/js/frappe/social/social_home.js
@@ -64,9 +64,14 @@ frappe.social.update_user_image = new frappe.ui.Dialog({
 	],
 	primary_action_label: __('Set Image'),
 	primary_action: (values) => {
-		frappe.db.set_value('User', frappe.session.user, 'user_image', values.image)
+		// TODO: check for a better fix
+		if (!frappe.session.user) {
+			frappe.session.user = frappe.boot.user.name;
+		}
+		const user = frappe.session.user;
+		frappe.db.set_value('User', user, 'user_image', values.image)
 			.then((resp) => {
-				frappe.boot.user_info[frappe.session.user].image = resp.message.user_image;
+				frappe.boot.user_info[user].image = resp.message.user_image;
 				frappe.app_updates.trigger('user_image_updated');
 				frappe.social.update_user_image.clear();
 				frappe.social.update_user_image.hide();