diff --git a/src/components/misc/notification.vue b/src/components/misc/notification.vue
index c12137ead..2c839a6fb 100644
--- a/src/components/misc/notification.vue
+++ b/src/components/misc/notification.vue
@@ -11,13 +11,17 @@
 			>
 				<div
 					class="notification-title"
-					v-html="props.item.title"
 					v-if="props.item.title"
-				></div>
+				>
+					{{ props.item.title }}
+				</div>
 				<div
 					class="notification-content"
-					v-html="props.item.text"
-				></div>
+				>
+					<template v-for="(t, k) in props.item.text">
+						{{ t }}<br :key="k"/>
+					</template>
+				</div>
 				<div
 					class="buttons is-right"
 					v-if="
diff --git a/src/message/index.js b/src/message/index.js
index 7d3f06b21..19e3ac836 100644
--- a/src/message/index.js
+++ b/src/message/index.js
@@ -1,31 +1,29 @@
+const getText = t => {
+
+	if (t.response && t.response.data && t.response.data.message) {
+		return [
+			t.message,
+			t.response.data.message
+		]
+	}
+
+	return [t.message]
+}
+
 export default {
 	error(e, context, actions = []) {
-		// Build the notification text from error response
-		let err = e.message
-		if (e.response && e.response.data && e.response.data.message) {
-			err += '<br/>' + e.response.data.message
-		}
-
-		// Fire a notification
 		context.$notify({
 			type: 'error',
 			title: 'Error',
-			text: err,
+			text: getText(e),
 			actions: actions,
 		})
 	},
 	success(e, context, actions = []) {
-		// Build the notification text from error response
-		let err = e.message
-		if (e.response && e.response.data && e.response.data.message) {
-			err += '<br/>' + e.response.data.message
-		}
-
-		// Fire a notification
 		context.$notify({
 			type: 'success',
 			title: 'Success',
-			text: err,
+			text: getText(e),
 			data: {
 				actions: actions,
 			},