diff --git a/admin/css/style.css b/admin/css/style.css
index 9b2b461..c397ebe 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -159,4 +159,9 @@ div.conversation ul { list-style-type: none; margin: 0px; padding: 0px 0px 0px 1
 	#admin-table tbody tr:hover {background: #EAECEE; color: #111; }
 	#admin-table thead tr .headerSortUp {background-image: url(images/asc.gif);}
 	#admin-table thead tr .headerSortDown {background-image: url(images/desc.gif);}
-	#admin-table thead tr .headerSortDown, #admin-table thead tr .headerSortUp {background-color:#8dbdd8;}
\ No newline at end of file
+	#admin-table thead tr .headerSortDown, #admin-table thead tr .headerSortUp {background-color:#8dbdd8;}
+
+/* validation */
+form.newpost input.validate_span {border:1px solid #ca3402; float:none;}
+	form.newpost span.validate_span {color:#ca3402; padding-left:10px; border:0; float:right;}
+
diff --git a/admin/feeds.php b/admin/feeds.php
index c9f9ac6..7e870ce 100644
--- a/admin/feeds.php
+++ b/admin/feeds.php
@@ -46,12 +46,28 @@ if ($user->isAdmin()) {
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.validate.min.js"></script>
 		<script type="text/javascript">
 		$(document).ready(function(){
 			$("#divMessages").fadeOut(5000,function(){
 				$("#divMessages").css({display:"none"});
 			});
 			$("#source").change(function (){selectFeedType('<?php echo __("Feed Url:")?>','<?php echo __(" username:")?>')})
+
+			$("#feedform").validate({
+				rules: {
+					url: {
+						required: true,
+						url: true
+					}
+				},
+				errorElement: "span",
+				errorClass: "validate_span", 
+				errorPlacement: function(label, element) { 
+					label.prependTo(element.prev())
+				} 
+			});
+
 		});
 		</script>
 		<style type="text/css" media="screen">	
@@ -80,7 +96,7 @@ if ($user->isAdmin()) {
 
 					<div class="tabla">
 
-						<form action="feeds.php" method="post" class="newpost">
+						<form action="feeds.php" method="post" class="newpost" id="feedform">
 						<fieldset>
 						<ul>
 							<li>
@@ -104,7 +120,7 @@ if ($user->isAdmin()) {
 							</li>
 							<li>
 								<label for="url" id="url_label"><?php echo __("Feed Url (double check):")?></label>
-									<input type="text" name="url" id="url" class="txt" />
+								<input type="text" name="url" id="url" class="txt" />
 							</li>
                             <li><label for="credits"><?php echo __('Show credits on each post?')?></label><input type="checkbox" name="credits" checked="checked" class="check" /></li>
 							<li>
diff --git a/admin/index.php b/admin/index.php
index cc33597..c8f468b 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -99,6 +99,7 @@ if ($user->isAdmin()) {
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/lightbox.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.validate.min.js"></script>
 		<script language="javascript" type="text/javascript">
 		$(document).ready(function(){
 			$("#divMessages").fadeOut(5000,function(){
diff --git a/admin/themes/admin/template_add_conversation.htm b/admin/themes/admin/template_add_conversation.htm
index 8892230..73ee16b 100644
--- a/admin/themes/admin/template_add_conversation.htm
+++ b/admin/themes/admin/template_add_conversation.htm
@@ -1,20 +1,35 @@
-									<p>
-										<label for="title">Title <span class="option">(optional)</span></label>
-											<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
-									</p>
-									<input type="hidden" name="url" id="url" value="" />
-									<p>
-										<label for="description">Conversation</label><br />
-										<div style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;">
-											<span style="font-weight: bold;">Example</span><br>
-											<span style="font-style: italic;">
-												Geek: Wow an open source tumblelog CMS!!.<br>
-												Normal: Tumble... what??<br>
-												Geek: Read the wikipedia!!
-											</span>
-										</div>
-											<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>
-									</p>
-									<input type="hidden" name="type" id="type" value="{type}" />
-									<input type="hidden" name="date" id="date" value="{date}" />
-									<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
\ No newline at end of file
+		<div>
+			<label for="title">Title <span class="option">(optional)</span></label>
+				<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
+		</div>
+		
+		<div>
+			<label for="description">Conversation</label>
+			<div style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;">
+				<span style="font-weight: bold;">Example</span><br>
+				<span style="font-style: italic;">
+					Geek: Wow an open source tumblelog CMS!!.<br>
+					Normal: Tumble... what??<br>
+					Geek: Read the wikipedia!!
+				</span>
+			</div>
+			<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>
+		</div>
+
+		<input type="hidden" name="url" id="url" value="" />
+		<input type="hidden" name="type" id="type" value="{type}" />
+		<input type="hidden" name="date" id="date" value="{date}" />
+		<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
+
+	<script>
+		$("#autosave").validate({
+			rules: {
+				description: "required"
+			},
+			errorElement: "span",
+			errorClass: "validate_span", 
+			errorPlacement: function(label, element) { 
+				label.prependTo(element.parent().children("label"))
+			} 
+		});
+	</script>
\ No newline at end of file
diff --git a/admin/themes/admin/template_add_link.htm b/admin/themes/admin/template_add_link.htm
index 43d0316..f36e890 100644
--- a/admin/themes/admin/template_add_link.htm
+++ b/admin/themes/admin/template_add_link.htm
@@ -1,20 +1,38 @@
-									<p>
-										<label for="title">Name <span class="option">(optional)</span></label>			
-											<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
-									</p>
-									<p>
-										<label for="url">URL</label>			
-											<input class="txt" type="text" name="url" id="url" value="{editUrl}" size="80" />
-									</p>
-									<p>
-									<div id="add_link_description" style="margin-top:5px;">
-										<a class="linkFrm" href="#" onclick="document.getElementById('link_description').style.display = ''; document.getElementById('add_link_description').style.display = 'none'; return false;" style="font-size:11px;">Add a description</a><br /><br />
-									</div>								
-									<div id="link_description" style="display:none;">
-										<label for="description">Description</label><br />								
-											<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
-									</div>
-									</p>
-									<input type="hidden" name="type" id="type" value="{type}" />
-									<input type="hidden" name="date" id="date" value="{date}" />
-									<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
\ No newline at end of file
+			
+			<div>
+				<label for="title">Name <span class="option">(optional)</span></label>			
+				<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
+			</div>
+			<div>
+				<label for="url">URL</label>			
+				<input class="txt" type="text" name="url" id="url" value="{editUrl}" size="80" />
+			</div>
+			<div>
+				<div id="add_link_description" style="margin-top:5px;">
+					<a class="linkFrm" href="#" onclick="document.getElementById('link_description').style.display = ''; document.getElementById('add_link_description').style.display = 'none'; return false;" style="font-size:11px;">Add a description</a><br /><br />
+				</div>								
+				<div id="link_description" style="display:none;">
+					<label for="description">Description</label><br />								
+					<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
+				</div>
+			</div>
+			<input type="hidden" name="type" id="type" value="{type}" />
+			<input type="hidden" name="date" id="date" value="{date}" />
+			<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
+
+
+	<script>
+		$("#autosave").validate({
+			rules: {
+				url: {
+					required: true,
+					url: true
+				}
+			},
+			errorElement: "span",
+			errorClass: "validate_span", 
+			errorPlacement: function(label, element) { 
+				label.prependTo(element.prev())
+			} 
+		});
+	</script>
\ No newline at end of file
diff --git a/admin/themes/admin/template_add_mp3.htm b/admin/themes/admin/template_add_mp3.htm
index a98b815..cc0680f 100644
--- a/admin/themes/admin/template_add_mp3.htm
+++ b/admin/themes/admin/template_add_mp3.htm
@@ -1,16 +1,35 @@
-									<input type="hidden" name="title" id="title" value="" />
-									<p>
-										<label for="url">MP3 URL</label>			
-											<input class="txt" type="text" name="url" id="url" value="{editUrl}" size="80" />
-										<div style="color: rgb(136, 136, 136); margin-bottom: 5px; font-size: 11px; font-weight: bold;">
-											This is the MP3 file URL or a GoEar URL.<br>
-											<span style="font-size: 10px; font-weight: normal;">(ie. http://www.goear.com/listen.php?v=c0a2c85)</span>
-										</div>
-									</p>									
-									<p>
-										<label for="description">Caption <span class="option">(optional)</span></label><br />
-											<textarea rows="12" cols="84" name="description" id="description" tabindex="2">{editBody}</textarea>											
-									</p>
-									<input type="hidden" name="type" id="type" value="{type}" />
-									<input type="hidden" name="date" id="date" value="{date}" />
-									<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
\ No newline at end of file
+									
+		<div>
+			<label for="url">MP3 URL</label>			
+			<input class="txt" type="text" name="url" id="url" value="{editUrl}" size="80" />
+			<div style="color: rgb(136, 136, 136); margin-bottom: 5px; font-size: 11px; font-weight: bold;">
+				This is the MP3 file URL or a GoEar URL.<br>
+				<span style="font-size: 10px; font-weight: normal;">(ie. http://www.goear.com/listen.php?v=c0a2c85)</span>
+			</div>
+		</div>								
+		<div>
+			<label for="description">Caption <span class="option">(optional)</span></label><br />
+			<textarea rows="12" cols="84" name="description" id="description" tabindex="2">{editBody}</textarea>											
+		</div>
+
+		<input type="hidden" name="title" id="title" value="" />
+		<input type="hidden" name="type" id="type" value="{type}" />
+		<input type="hidden" name="date" id="date" value="{date}" />
+		<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
+
+
+	<script>
+		$("#autosave").validate({
+			rules: {
+				url: {
+					required: true,
+					url: true
+				}
+			},
+			errorElement: "span",
+			errorClass: "validate_span", 
+			errorPlacement: function(label, element) { 
+				label.prependTo(element.prev())
+			} 
+		});
+	</script>
\ No newline at end of file
diff --git a/admin/themes/admin/template_add_photo.htm b/admin/themes/admin/template_add_photo.htm
index bb1cbf1..3f71f26 100644
--- a/admin/themes/admin/template_add_photo.htm
+++ b/admin/themes/admin/template_add_photo.htm
@@ -1,31 +1,76 @@
-									<input class="txt" type="hidden" name="title" id="title" value="" />
-									<p>
-										<div id="photo_upload">
-											<label for="description">Photo</label>												
-												<input type="file" name="photo" accept="image/gif,image/jpeg,image/jpg,image/png"/>
-											<div style="font-size:11px; color:#666; margin-top:5px;">
-												Supports JPEG, GIF and PNG.&nbsp; <strong>Max size is 10 MB.</strong>
-											</div>
-											<div style="font-size:11px; color:#666; margin-top:5px;">
-												<a class="linkFrm" href="#" onclick="document.getElementById('photo_upload').style.display = 'none';
-												document.getElementById('photo_url').style.display = 'block';
-												return false;">Use a URL instead</a>								
-											</div>
-										</div>
-									
-										<div id="photo_url" style="display:none;">
-											<label for="description">Photo URL</label>
-												<input class="input-text" type="text" name="url" id="url" size="80" value="{editUrl}" />
-											<div style="font-size:11px; color:#666; margin-top:5px;">
-												The photo URL.</b>
-											</div>
-										</div>
-									</p>
-									<p>
-										<label for="description">Caption <span class="option">(optional)</span></label><br />
-											<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
-									</p>
-									<input type="hidden" name="MAX_FILE_SIZE" value="10485760" />
-									<input type="hidden" name="type" id="type" value="{type}" />
-									<input type="hidden" name="date" id="date" value="{date}" />
-									<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
\ No newline at end of file
+
+
+	<div id="photo_upload">
+		<label for="description">Photo</label>												
+		<input type="file" name="photo" id="photo" accept="image/gif,image/jpeg,image/jpg,image/png"/>
+		<div style="font-size:11px; color:#666; margin-top:5px;">
+			Supports JPEG, GIF and PNG.&nbsp; <strong>Max size is 10 MB.</strong>
+		</div>
+		<div style="font-size:11px; color:#666; margin-top:5px;">
+			<a href="#" class="linkFrm">Use a URL instead</a>								
+		</div>
+	</div>
+
+	<div id="photo_url">
+		<label for="description">Photo URL</label>
+		<input class="input-text" type="text" name="url" id="url" size="80" value="{editUrl}" />
+		<div style="font-size:11px; color:#666; margin-top:5px;">
+			<a href="#" class="linkFrm">Use a upload form instead</a>
+		</div>
+	</div>
+
+	<div>
+		<label for="description" style="display:block;">Caption <span class="option">(optional)</span></label>
+		<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
+	</div>
+
+	<input type="hidden" name="title" id="title" value="" />
+	<input type="hidden" name="MAX_FILE_SIZE" value="10485760" />
+	<input type="hidden" name="type" id="type" value="{type}" />
+	<input type="hidden" name="date" id="date" value="{date}" />
+	<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
+
+
+
+
+	<script>
+		$('#photo_url').css('display','none');
+		$("#autosave").validate({
+			rules: {				
+				photo: { 
+					required:  function() {
+ 						return ($('#photo_upload').css('display')!= 'none') ? true : false;
+  					},
+					accept: "(jpe?g|gif|png)" 
+				},
+ 				url: { 
+					required:  function() {
+ 						return ($('#photo_url').css('display')!= 'none') ? true : false;
+  					},
+					url: true
+				}
+			},
+			errorElement: "span",
+			errorClass: "validate_span", 
+			errorPlacement: function(label, element) { 
+				label.prependTo(element.prev())
+			}			 
+		});
+
+		$("#photo_upload a.linkFrm").click( function() {
+				$('#photo_upload').css('display','none');				
+				$('#photo_url').css('display','block'); 
+				$('#photo').val(''); 
+				return false;
+			} 
+		);
+		
+		$("#photo_url a.linkFrm").click( function() {
+				$('#photo_url').css('display','none');				
+				$('#photo_upload').css('display','block'); 
+				$('#url').val(''); 
+				return false;
+			} 
+		);
+
+	</script>
\ No newline at end of file
diff --git a/admin/themes/admin/template_add_post.htm b/admin/themes/admin/template_add_post.htm
index 18dcc89..183165d 100644
--- a/admin/themes/admin/template_add_post.htm
+++ b/admin/themes/admin/template_add_post.htm
@@ -1,12 +1,27 @@
-									<p>
-										<label for="title">Title <span class="option">(optional)</span></label>
-											<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
-									</p>
-									<input class="txt" type="hidden" name="url" id="url" value="" />
-									<p>
-										<label for="description">Body</label><br />
-											<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
-									</p>
-									<input type="hidden" name="type" id="type" value="{type}" />
-									<input type="hidden" name="date" id="date" value="{date}" />
-									<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
\ No newline at end of file
+	
+	<div>
+		<label for="title" style="display:block;">Title <span class="option">(optional)</span></label>
+		<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
+	</div>	
+	<div>
+		<label for="description" style="display:block;">Body</label>
+		<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
+	</div>
+
+	<input type="hidden" name="url" id="url" value="" />
+	<input type="hidden" name="type" id="type" value="{type}" />
+	<input type="hidden" name="date" id="date" value="{date}" />
+	<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
+
+	<script>
+		$("#autosave").validate({
+			rules: {
+				description: "required"
+			},
+			errorElement: "span",
+			errorClass: "validate_span", 
+			errorPlacement: function(label, element) { 
+				label.prependTo(element.prev())
+			} 
+		});
+	</script>
\ No newline at end of file
diff --git a/admin/themes/admin/template_add_quote.htm b/admin/themes/admin/template_add_quote.htm
index f12fee5..5e949ce 100644
--- a/admin/themes/admin/template_add_quote.htm
+++ b/admin/themes/admin/template_add_quote.htm
@@ -1,12 +1,29 @@
-									<input type="hidden" name="url" id="url" value="" />
-									<p>
-										<label for="description">Quote</label><br />
-											<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
-									</p>
-									<p>
-										<label for="title">Source <span class="option">(optional)</span></label>
-											<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
-									</p>
-									<input type="hidden" name="type" id="type" value="{type}" />
-									<input type="hidden" name="date" id="date" value="{date}" />
-									<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
\ No newline at end of file
+		
+		
+		<div>
+			<label for="description">Quote</label>
+			<textarea rows="12" cols="84" name="description" id="description">{editBody}</textarea>											
+		</div>
+		<div>
+			<label for="title">Source <span class="option">(optional)</span></label>
+			<input class="txt" type="text" name="title" id="title" value="{editTitle}" size="80" />
+		</div>
+
+		<input type="hidden" name="url" id="url" value="" />
+		<input type="hidden" name="type" id="type" value="{type}" />
+		<input type="hidden" name="date" id="date" value="{date}" />
+		<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
+
+
+	<script>
+		$("#autosave").validate({
+			rules: {
+				description: "required"
+			},
+			errorElement: "span",
+			errorClass: "validate_span", 
+			errorPlacement: function(label, element) { 
+				label.prependTo(element.prev())
+			} 
+		});
+	</script>
\ No newline at end of file
diff --git a/admin/themes/admin/template_add_video.htm b/admin/themes/admin/template_add_video.htm
index 159573c..c589f85 100644
--- a/admin/themes/admin/template_add_video.htm
+++ b/admin/themes/admin/template_add_video.htm
@@ -1,16 +1,35 @@
-									<input type="hidden" name="title" id="title" value="" />
-									<p>
-										<label for="url">Video URL</label>			
-											<input class="txt" type="text" name="url" id="url" value="{editUrl}" size="80" />
-										<div style="color: rgb(136, 136, 136); margin-bottom: 5px; font-size: 11px; font-weight: bold;">
-											This is the URL from the video sites YouTube or Vimeo.<br>
-											<span style="font-size: 10px; font-weight: normal;">(ie. http://youtube.com/watch?v=HcBFLN9cli0)</span>
-										</div>
-									</p>									
-									<p>
-										<label for="description">Caption <span class="option">(optional)</span></label><br />
-											<textarea rows="12" cols="84" name="description" id="description" tabindex="2">{editBody}</textarea>											
-									</p>
-									<input type="hidden" name="type" id="type" value="{type}" />
-									<input type="hidden" name="date" id="date" value="{date}" />
-									<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
\ No newline at end of file
+				
+		<div>
+			<label for="url">Video URL</label>			
+			<input class="txt" type="text" name="url" id="url" value="{editUrl}" size="80" />
+			<div style="color: rgb(136, 136, 136); margin-bottom: 5px; font-size: 11px; font-weight: bold;">
+				This is the URL from the video sites YouTube or Vimeo.<br>
+				<span style="font-size: 10px; font-weight: normal;">(ie. http://youtube.com/watch?v=HcBFLN9cli0)</span>
+			</div>
+		</div>									
+		<div>
+			<label for="description">Caption <span class="option">(optional)</span></label><br />
+			<textarea rows="12" cols="84" name="description" id="description" tabindex="2">{editBody}</textarea>											
+		</div>
+
+		<input type="hidden" name="title" id="title" value="" />
+		<input type="hidden" name="type" id="type" value="{type}" />
+		<input type="hidden" name="date" id="date" value="{date}" />
+		<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
+
+
+	<script>
+		$("#autosave").validate({
+			rules: {
+				url: {
+					required: true,
+					url: true
+				}
+			},
+			errorElement: "span",
+			errorClass: "validate_span", 
+			errorPlacement: function(label, element) { 
+				label.prependTo(element.prev())
+			} 
+		});
+	</script>
\ No newline at end of file
diff --git a/login.php b/login.php
index 3425aaa..2475048 100644
--- a/login.php
+++ b/login.php
@@ -36,6 +36,26 @@ if ($user->isAuthenticated()) {
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.validate.min.js"></script>
+
+		<script type="text/javascript">
+		$(document).ready(function(){
+	
+			$("#valida").validate({
+				rules: {
+					login: "required",
+					pass: "required"
+				},
+				errorElement: "span",
+				errorClass: "validate_span", 
+				errorPlacement: function(label, element) { 
+					label.prependTo(element.prev())
+				} 
+			});
+
+		});
+		</script>
 		<style type="text/css" media="screen">	
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
 		</style>