diff --git a/upload/.htaccess b/upload/.htaccess
index f660e900..b3cecf96 100644
--- a/upload/.htaccess
+++ b/upload/.htaccess
@@ -63,6 +63,7 @@ RewriteRule ^page/([0-9]+)/(.*)						view_page.php?pid=$1 [nc]
 RewriteRule ^search/result							search_result.php [nc]
 RewriteRule ^upload									upload.php [nc]
 RewriteRule ^contact								contact.php [nc]
+RewriteRule ^categories								categories.php [nc]
 
 #Group Section
 
@@ -77,8 +78,8 @@ RewriteRule ^sitemap.xml$ sitemap.php
 RewriteRule ^signup signup.php
 
 #Error Pages
-ErrorDocument 404 /view_page.php?pid=6
-ErrorDocument 403 /view_page.php?pid=5
+ErrorDocument 404 /404.php
+ErrorDocument 403 /403.php
 
 ########## End - Rewrite rules For SEO urls ######################
 RewriteRule ^rss$                           rss.php [nc]
diff --git a/upload/403.php b/upload/403.php
new file mode 100644
index 00000000..b189790d
--- /dev/null
+++ b/upload/403.php
@@ -0,0 +1,26 @@
+<?php
+/* 
+ ********************************************************************
+ | Copyright (c) 2007-2009 Clip-Bucket.com. All rights reserved.	
+ | @ Author : ArslanHassan											
+ | @ Software : ClipBucket , © PHPBucket.com							
+ ********************************************************************
+*/
+
+define("THIS_PAGE",'403');
+require 'includes/config.inc.php';
+
+if(file_exists(LAYOUT."/403.html")) {
+	template_files('403.html');
+} else {
+	$file_name = "403.html";
+	$fh = fopen(LAYOUT."/".$file_name,'w');
+	$data = "<h2>403 Error</h2>\n";
+	$data .= "<p>Sorry, you cannot access this page.</p>";
+	fwrite($fh, $data);
+	fclose($fh);
+	template_files('403.html');
+}
+
+display_it();
+?>
\ No newline at end of file
diff --git a/upload/404.php b/upload/404.php
new file mode 100644
index 00000000..3b3af754
--- /dev/null
+++ b/upload/404.php
@@ -0,0 +1,26 @@
+<?php
+/* 
+ ********************************************************************
+ | Copyright (c) 2007-2009 Clip-Bucket.com. All rights reserved.	
+ | @ Author : ArslanHassan											
+ | @ Software : ClipBucket , © PHPBucket.com							
+ ********************************************************************
+*/
+
+define("THIS_PAGE",'404');
+require 'includes/config.inc.php';
+
+if(file_exists(LAYOUT."/404.html")) {
+	template_files('404.html');
+} else {
+	$file_name = "404.html";
+	$fh = fopen(LAYOUT."/".$file_name,'w');
+	$data = "<h2>404 Error</h2>\n";
+	$data .= "<p>Requested page not found.</p>";
+	fwrite($fh, $data);
+	fclose($fh);
+	template_files('404.html');
+}
+
+display_it();
+?>
\ No newline at end of file
diff --git a/upload/includes/classes/search.class.php b/upload/includes/classes/search.class.php
index 0e743761..4426bbc2 100644
--- a/upload/includes/classes/search.class.php
+++ b/upload/includes/classes/search.class.php
@@ -170,7 +170,7 @@ class cbsearch
 								tbl($this->db_tbl.'.*,users.userid,users.username').$add_select_field,
 							$query_cond." ".tbl($this->db_tbl).".userid=".tbl("users.userid")." AND ".tbl($this->db_tbl).".active='yes'",$this->limit,$sorting);
 							//echo $db->db_query;
-			$db->db_query;
+			//$db->db_query;
 			$this->total_results = $db->count(tbl($this->db_tbl),'*',$condition);
 			
 		}else
diff --git a/upload/includes/classes/user.class.php b/upload/includes/classes/user.class.php
index cf561d5d..ea30c86a 100644
--- a/upload/includes/classes/user.class.php
+++ b/upload/includes/classes/user.class.php
@@ -1253,6 +1253,13 @@ class userquery extends CBCategory{
 				{
 					//Sending confirmation email
 					$tpl = $cbemail->get_template('password_reset_request');
+					
+					if(!$udetails['avcode']) 
+					{
+						$avcode = RandomString(10);
+						$db->update(tbl($this->dbtbl['users']),array('avcode'),array($avcode)," userid='".$udetails['userid']."'");			
+					}
+										
 					$more_var = array
 					('{username}'	=> $udetails['username'],
 					 '{email}'		=> $udetails['email'],
diff --git a/upload/styles/cbv2new/layout/footer.html b/upload/styles/cbv2new/layout/footer.html
index f3e7e8ff..dafc2ae8 100644
--- a/upload/styles/cbv2new/layout/footer.html
+++ b/upload/styles/cbv2new/layout/footer.html
@@ -8,7 +8,7 @@
         
         {foreach from=$foot_menu item=fm}
         	{if $fm.name!=''}
-            	<li><a href="{$fm.link}" {if $fm.target} target="{$fmtarget}"{/if} {if $fm.onclick} onclick="{$fm.onclick}" {/if}>{$fm.name}</a></li>
+            	<li><a href="{$fm.link}" {if $fm.target} target="{$fm.target}"{/if} {if $fm.onclick} onclick="{$fm.onclick}" {/if}>{$fm.name}</a></li>
             {/if}
         {/foreach}
     </ul>
diff --git a/upload/styles/cbv2new/layout/global_header.html b/upload/styles/cbv2new/layout/global_header.html
index 97c42550..bd421254 100644
--- a/upload/styles/cbv2new/layout/global_header.html
+++ b/upload/styles/cbv2new/layout/global_header.html
@@ -171,7 +171,7 @@ var mid  = {$smarty.get.mid};
 	
 	function ToggleView(obj) {
 		var obj = $(obj),
-			obj_id = obj.attr('id');
+			obj_id = obj.attr('id'),
 			parent = obj.parent().attr('id'),
 			target = $("#"+parent).next().attr('id');
 			//alert('#'+parent+' #'+target+' .grid_view');