diff --git a/upload/styles/cb_28/layout/signup.html b/upload/styles/cb_28/layout/signup.html
index d5813f1a..9d512bfc 100644
--- a/upload/styles/cb_28/layout/signup.html
+++ b/upload/styles/cb_28/layout/signup.html
@@ -180,19 +180,31 @@
 		"empty_email" : "{lang code='usr_email_err1'}" , 
 		"invalid_email":"{lang code='usr_email_err2'}",
 		"user_exists":"{lang code='usr_uname_err2'}",
-		"email_exists":"{lang code='usr_email_err3'}"
+		"email_exists":"{lang code='usr_email_err3'}",
+		"weak_pass":"pass is weak"
 	};
 	function removeErrClass(obj, passSec = false) {
 		$(obj).closest('.form-group').removeClass('invalid-error');
+		$(obj).closest('.form-group').removeClass('warning-ind');
+		$(obj).closest('.form-group').addClass('success-ind');
 		$(obj).next('span').remove();
 		if (passSec == true) {
 			theVal = 'password';
+		} else {
+			theVal = $(obj).val();
 		}
 		$('<span class="help-block"><strong>'+theVal+'</strong> seems good to go</span>').insertAfter(obj);
 	}
 
-	function addErrClass(obj, msg, override = false, scroll = true) {
-		$(obj).closest('.form-group').addClass('invalid-error');
+	function addErrClass(obj, msg, override = false, scroll = true, tclass = false) {
+		$(obj).closest('.form-group').removeClass('success-ind');
+		if (tclass != false) {
+			$(obj).closest('.form-group').removeClass('invalid-error');
+			$(obj).closest('.form-group').addClass(tclass);
+		} else {
+			$(obj).closest('.form-group').removeClass('warning-ind');
+			$(obj).closest('.form-group').addClass('invalid-error');
+		}
 		if (override == true) {
 			$(obj).next('span').remove();
 		}
@@ -273,7 +285,11 @@
 	     if (passLen == 0 || passVal == '') {
 	     	addErrClass(passSec, errors["empty_pass"], true, false);
 	     } else {
-	     	removeErrClass(passSec,true);
+	     	if (passLen < 8) {
+	     		addErrClass(passSec,errors["weak_pass"],true, false ,'warning-ind');
+	     	} else {
+	     		removeErrClass(passSec,true);
+	     	}
 	     }
 	});
 
diff --git a/upload/styles/cb_28/theme/js/custom.js b/upload/styles/cb_28/theme/js/custom.js
index 0be92df1..e3313e25 100644
--- a/upload/styles/cb_28/theme/js/custom.js
+++ b/upload/styles/cb_28/theme/js/custom.js
@@ -98,6 +98,10 @@ function homePageVideos(qlist_items) {
 		newloadHit = parseInt(loadHit) + 1;
 		moreRecent = true;
 		moreFeatured = true;
+
+		featuredFound = '';
+		recentFound = '';
+
 		$.ajax({
 			url: loadLink,
 			type: sendType,
@@ -112,6 +116,20 @@ function homePageVideos(qlist_items) {
 			success: function(data) {
 				var jsonData = $.parseJSON(data);
 				num = jsonData.more_vids;
+				if (loadMode == 'recent') {
+					if (num > 6) {
+						recentFound = 6;
+					} else {
+						recentFound = 53;
+					}
+				} else {
+					if (num > 2) {
+						featuredFound = 2;
+					} else {
+						featuredFound = 45;
+					}
+				}
+
 				if (num == 'none') {
 					if (loadMode == 'recent') {
 						moreRecent = false;