diff --git a/JS/expanded.js b/JS/expanded.js
index 3c7f6eb..86aa9db 100644
--- a/JS/expanded.js
+++ b/JS/expanded.js
@@ -175,15 +175,14 @@ async function GetPost() {
 async function MastodonReplylFunction(ClassName, post) {
 	let OtherPost = await MastodonAPI.GetStatus(post);
 	document.getElementsByClassName("Origin " + ClassName)[0].innerHTML = website;
-	document.getElementsByClassName("Handle " + ClassName)[0].innerHTML = OtherPost.account.username;
+	document.getElementsByClassName("Handle " + ClassName)[0].innerHTML = post.account.acct;
 	if (OtherPost.spoiler_text != "") {
 		document.getElementsByClassName("PostText " + ClassName)[0].innerHTML = "WARNING: " + OtherPost.spoiler_text;
 	} else {
 		document.getElementsByClassName("PostText " + ClassName)[0].innerHTML = OtherPost.content;
-	}
-	if (OtherPost.media_attachments.length != 0) {
-		for (let i of OtherPost.media_attachments) {
-			ApplyMedia(i, document.getElementsByClassName("Images " + ClassName)[0]);
+		if (OtherPost.media_attachments.length != 0) {
+			for (let i of OtherPost.media_attachments) {
+				ApplyMedia(i, document.getElementsByClassName("Images " + ClassName)[0]);
 		}
 	}
 	return OtherPost;