diff --git a/Protest/Front/deviceview.js b/Protest/Front/deviceview.js
index 27d3c99f..8bf641f0 100644
--- a/Protest/Front/deviceview.js
+++ b/Protest/Front/deviceview.js
@@ -1490,6 +1490,7 @@ class DeviceView extends View {
 		}
 
 		const saveButton = super.Edit(isNew);
+		
 		saveButton.addEventListener("click", async ()=> {
 			let obj = {};
 			for (let i=0; i<this.attributes.childNodes.length; i++) {
@@ -1507,6 +1508,20 @@ class DeviceView extends View {
 
 				if (response.status !== 200) LOADER.HttpErrorHandler(response.status);
 
+				const origin = KEEP.username;
+				const date = UI.UnixDateToTicks(new Date().getTime());
+
+				for (let key in obj) {
+					if (!isNew && key in this.link && this.link[key].v === obj[key].v) {
+						obj[key].o = this.link[key].o;
+						obj[key].d = this.link[key].d;
+					}
+					else {
+						obj[key].o = origin;
+						obj[key].d = date;
+					}
+				}
+
 				const json = await response.json();
 				if (json.error) throw(json.error);
 
@@ -2753,7 +2768,6 @@ class DeviceView extends View {
 								element.childNodes[1].firstChild.style.backgroundImage = "url(mono/checked.svg)";
 								element.childNodes[1].firstChild.style.paddingLeft = "32px";
 							}
-
 						}
 						else {
 							if (element.childNodes[1].firstChild.value.length > 0) {
diff --git a/Protest/Front/userview.js b/Protest/Front/userview.js
index 3c1c1082..27f47b69 100644
--- a/Protest/Front/userview.js
+++ b/Protest/Front/userview.js
@@ -207,13 +207,14 @@ class UserView extends View {
 		}
 
 		const saveButton = super.Edit(isNew);
+
 		saveButton.addEventListener("click", async ()=> {
 			let obj = {};
-			for (let i = 0; i < this.attributes.childNodes.length; i++) {
+			for (let i=0; i<this.attributes.childNodes.length; i++) {
 				if (this.attributes.childNodes[i].childNodes.length < 2) continue;
 				let name = this.attributes.childNodes[i].childNodes[0].value.toLowerCase();
 				let value = this.attributes.childNodes[i].childNodes[1].firstChild.value;
-				obj[name] = { v: value };
+				obj[name] = {v: value};
 			}
 
 			try {
@@ -224,6 +225,20 @@ class UserView extends View {
 
 				if (response.status !== 200) LOADER.HttpErrorHandler(response.status);
 
+				const origin = KEEP.username;
+				const date = UI.UnixDateToTicks(new Date().getTime());
+
+				for (let key in obj) {
+					if (!isNew && key in this.link && this.link[key].v === obj[key].v) {
+						obj[key].o = this.link[key].o;
+						obj[key].d = this.link[key].d;
+					}
+					else {
+						obj[key].o = origin;
+						obj[key].d = date;
+					}
+				}
+
 				const json = await response.json();
 				if (json.error) throw (json.error);
 
diff --git a/Protest/Front/view.js b/Protest/Front/view.js
index 89f406c1..ce198e0f 100644
--- a/Protest/Front/view.js
+++ b/Protest/Front/view.js
@@ -137,9 +137,25 @@ class View extends Window {
 		newAttribute.appendChild(infoBox);
 
 		if (date && origin) {
-			let modDate = new Date(UI.TicksToUnixDate(date));
+			const nowDate = new Date();
+			const modDate = new Date(UI.TicksToUnixDate(date));
+
+			let dateString, timeString;
+			if (nowDate - modDate < 300000) {
+				dateString = "Just now";
+				timeString = null;
+			}
+			else if (nowDate.getUTCFullYear() === modDate.getUTCFullYear() && nowDate.getUTCMonth() === modDate.getUTCMonth() && nowDate.getUTCDate() === modDate.getUTCDate()) {
+				dateString = "Today";
+				timeString = modDate.toLocaleTimeString(UI.regionalFormat, {hour:"2-digit", minute:"2-digit"});
+			}
+			else {
+				dateString = modDate.toLocaleDateString(UI.regionalFormat, {});
+				timeString = modDate.toLocaleTimeString(UI.regionalFormat, {hour:"2-digit", minute:"2-digit"});
+			}
+
 			const dateBox = document.createElement("div");
-			dateBox.textContent = `${modDate.toLocaleDateString(UI.regionalFormat, {})}`;
+			dateBox.textContent = `${dateString}${timeString ? ", " + timeString : ""}`;
 			infoBox.appendChild(dateBox);
 
 			const originBox = document.createElement("div");
@@ -845,13 +861,9 @@ class View extends Window {
 			}
 		};
 
-		saveButton.onclick = ()=> {
-			ExitEdit();
-		};
+		saveButton.onclick = ()=> ExitEdit();
 
-		revertButton.onclick = ()=> {
-			Revert(true);
-		};
+		revertButton.onclick = ()=> Revert(true);
 
 		cancelButton.onclick = ()=> {
 			if (isNew) {