diff --git a/classes/script_start.php b/classes/script_start.php
index 242ee830..91af630d 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -2096,7 +2096,7 @@ function update_tracker($Action, $Updates, $ToIRC = false) {
 		send_irc("PRIVMSG #tracker :{$Attempts} {$Err} {$Get}");
 		if($Cache->get_value('ocelot_error_reported') === false) {
 			send_irc("PRIVMSG ".ADMIN_CHAN." :Failed to update ocelot: ".$Err." : ".$Get);
-			$Cache->cache_value('ocelot_error_reported', true);
+			$Cache->cache_value('ocelot_error_reported', true, 900);
 		}
 	}
 	return ($Return == "success");
diff --git a/sections/collages/new.php b/sections/collages/new.php
index cbb6155c..fb25845a 100644
--- a/sections/collages/new.php
+++ b/sections/collages/new.php
@@ -2,10 +2,25 @@
 show_header('Create a collage');
 
 if (!check_perms('site_collages_renamepersonal')) {
-	$ChangeJS = 'OnChange="if ( this.options[this.selectedIndex].value == \'0\') { namebox.style.display = \'none\'; personal.style.display = \'inline\'; } else { namebox.style.display = \'inline\'; personal.style.display = \'none\'; }"';
+	$ChangeJS = "OnChange=\"if ( this.options[this.selectedIndex].value == '0') { $('#namebox').hide(); $('#personal').show(); } else { $('#namebox').show(); $('#personal').hide(); }\"";
+}
+
+$Name        = $_REQUEST['name'];
+$Category    = $_REQUEST['cat'];
+$Description = $_REQUEST['descr'];
+$Tags        = $_REQUEST['tags'];
+$Error       = $_REQUEST['err'];
+
+if (!check_perms('site_collages_renamepersonal') && $Category === '0') {
+	$NoName = true;
 }
 ?>
 <div class="thin">
+<?
+if (!empty($Error)) { ?>
+	<div class="save_message error"><?=display_str($Error)?></div>
+	<br />
+<? } ?>
 	<form action="collages.php" method="post" name="newcollage">
 		<input type="hidden" name="action" value="new_handle" />
 		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
@@ -13,8 +28,8 @@
 			<tr id="collagename">
 				<td class="label"><strong>Name</strong></td>
 				<td>
-					<input type="text" name="name" size="60" id="namebox" />
-					<span id="personal" style="display: none; font-style: oblique"><strong><?=$LoggedUser['Username']?>'s personal collage</strong></span>
+					<input type="text" class="<?=$NoName?'hidden':''?>" name="name" size="60" id="namebox" value="<?=display_str($Name)?>" />
+					<span id="personal" class="<?=$NoName?'':'hidden'?>" style="font-style: oblique"><strong><?=$LoggedUser['Username']?>'s personal collage</strong></span>
 				</td>
 			</tr>
 			<tr>
@@ -25,12 +40,12 @@
 array_shift($CollageCats);
 		
 foreach($CollageCats as $CatID=>$CatName) { ?>
-						<option value="<?=$CatID+1?>"><?=$CatName?></option>
+						<option value="<?=$CatID+1?>"<?=(($CatID+1 == $Category)?' selected':'')?>><?=$CatName?></option>
 <? } 
 $DB->query("SELECT COUNT(ID) FROM collages WHERE UserID='$LoggedUser[ID]' AND CategoryID='0' AND Deleted='0'");
 list($CollageCount) = $DB->next_record();
 if(($CollageCount < $LoggedUser['Permissions']['MaxCollages']) && check_perms('site_collages_personal')) { ?>
-						<option value="0">Personal</option>
+						<option value="0"<?=(($Category === '0')?' selected':'')?>>Personal</option>
 <? } ?>
 					</select>
 					<br />
@@ -51,13 +66,13 @@
 			<tr>
 				<td class="label">Description</td>
 				<td>
-					<textarea name="description" id="description" cols="60" rows="10"></textarea>
+					<textarea name="description" id="description" cols="60" rows="10"><?=display_str($Description)?></textarea>
 				</td>
 			</tr>
 			<tr>
 				<td class="label"><strong>Tags (comma-separated)</strong></td>
 				<td>
-					<input type="text" id="tags" name="tags" size="60" />
+					<input type="text" id="tags" name="tags" size="60" value="<?=display_str($Tags)?>" />
 				</td>
 			</tr>
 			<tr>
diff --git a/sections/collages/new_handle.php b/sections/collages/new_handle.php
index c10fc3c5..30cafad9 100644
--- a/sections/collages/new_handle.php
+++ b/sections/collages/new_handle.php
@@ -54,8 +54,13 @@
 }
 
 if($Err) {
-	error($Err);
-	header('Location: collages.php?action=new');
+	//error($Err);
+	$Err         = urlencode($Err);
+	$Name        = urlencode($_POST['name']);
+	$Category    = urlencode($_POST['category']);
+	$Tags        = urlencode($_POST['tags']);
+	$Description = urlencode($_POST['description']);
+	header("Location: collages.php?action=new&err=$Err&name=$Name&cat=$Category&tags=$Tags&descr=$Description");
 	die();
 }