diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index 0e687c8b04..66206636e1 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -39,9 +39,9 @@
 	var/datum/map_template/M
 	switch(alert(src, "What kind of map is this?", "Map type", "Normal", "Shuttle", "Cancel"))
 		if("Normal")
-			M = new /datum/map_template(map, "[map]", TRUE)
+			M = new /datum/map_template(map, "[map] - Uploaded by [ckey] at [time2text(world.timeofday,"YYYY-MM-DD hh:mm:ss")]", TRUE)
 		if("Shuttle")
-			M = new /datum/map_template/shuttle(map, "[map]", TRUE)
+			M = new /datum/map_template/shuttle(map, "[map] - Uploaded by [ckey] at [time2text(world.timeofday,"YYYY-MM-DD hh:mm:ss")]", TRUE)
 		else
 			return
 	if(!M.cached_map)
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 05e4183ce5..f69c4c62a9 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -55,7 +55,11 @@
 /datum/parsed_map/New(tfile, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper=INFINITY, measureOnly=FALSE)
 	if(isfile(tfile))
 		original_path = "[tfile]"
+		var/temp_hack_garbage = tfile
 		tfile = rustg_file_read(tfile)
+		//This is hacky garbage
+		if(tfile == "") //Might be an upload, try raw loading it.
+			tfile = file2text(temp_hack_garbage)
 	else if(isnull(tfile))
 		// create a new datum without loading a map
 		return