diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index 8ef5cd730f..008d9f2ac1 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -425,15 +425,14 @@ datum/preferences
 			switch(link_tags["real_name"])
 				if("input")
 					new_name = reject_bad_name( input(user, "Please select a name:", "Character Generation")  as text|null )
+					if(new_name)
+						real_name = new_name
+					else
+						user << "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>"
 
 				if("random")
 					randomize_name()
 
-			if(new_name)
-				real_name = new_name
-			else
-				user << "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>"
-
 		if(link_tags["age"])
 			switch(link_tags["age"])
 				if("input")
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 3202fdd32f..9672d34ca0 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -157,6 +157,11 @@
 		icon_state = "hair_spikey"
 		choose_female = 0
 
+	spikey
+		name = "Floorlength Braid"
+		icon_state = "hair_braid"
+		choose_male = 0
+
 /*
 ///////////////////////////////////
 /  =---------------------------=  /
diff --git a/html/changelog.html b/html/changelog.html
index 9378e9a46d..ee8373d850 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,6 +46,14 @@ 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">13 July 2012</h2>
+	<h3 class="author">Carn updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="imageadd">Added FLOORLENGTH HAIR. YEESSSSSSSS!!!! :3 If you like it say thanks to Ausops for fixing it up. Credits to Powerfulstation for the original sprite.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">Thursday July 12th 2012</h2>
 	<h3 class="author">Giacom updated:</h3>
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index e123a7128f..dbb057d842 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ