diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index ef57be9f47..2e8152551d 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -98,7 +98,7 @@
 		if("announce")
 			if(src.authenticated==2)
 				if(message_cooldown)	return
-				var/input = copytext(sanitize(input(usr, "Please choose a message to announce to the station crew.", "What?", "")),1,MAX_MESSAGE_LEN)
+				var/input = copytext(strip_html_simple(input(usr, "Please choose a message to announce to the station crew.", "What?", "")),1,MAX_MESSAGE_LEN)
 				if(!input || !(usr in view(1,src)))
 					return
 				captain_announce(input)//This should really tell who is, IE HoP, CE, HoS, RD, Captain
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index ed17140de4..91b5f5bca4 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -149,7 +149,7 @@
 	updateinfolinks()
 
 /obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
-	t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+//	t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
 
 	t = dd_replacetext(t, "\[center\]", "<center>")
 	t = dd_replacetext(t, "\[/center\]", "</center>")
@@ -184,7 +184,7 @@
 
 		t = "<font face=\"[crayonfont]\" color=[P.colour]><b>[t]</b></font>"
 
-	t = dd_replacetext(t, "#", "") // Junk converted to nothing!
+//	t = dd_replacetext(t, "#", "") // Junk converted to nothing!
 
 	//Count the fields
 	var/laststart = 1
diff --git a/html/changelog.html b/html/changelog.html
index 5ab731b3ee..8ec86b0d3e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,6 +46,15 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">June 18th, 2012</h2>
+	<h3 class="author">Giacom updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Fix for special characters on paper and from announcements</li>
+	</ul>
+</div>
+
+
 <div class="commit sansserif">
 	<h2 class="date">June 18th, 2012</h2>
 	<h3 class="author">Sieve updated:</h3>