diff --git a/web/Controllers/GoogleController.cs b/web/Controllers/GoogleController.cs
index 9ce50c5b..e7c90562 100644
--- a/web/Controllers/GoogleController.cs
+++ b/web/Controllers/GoogleController.cs
@@ -27,8 +27,22 @@ namespace Yavsc.Controllers
 	{
 		private string SetSessionSate ()
 		{
+			string state = "security_token";
 			Random rand = new Random ();
-			string state = "security_token" + rand.Next (100000).ToString () + rand.Next (100000).ToString ();
+			for (int l = 0; l < 32; l++) {
+				int r = rand.Next (62);
+				char c;
+				if (r < 10) {
+					c = (char)('0' +  r);
+				} else if (r < 36) {
+					r -= 10;
+					c = (char) ('a' + r);
+				} else {
+					r -= 36;
+					c = (char) ('A' + r);
+				}
+				state += c;
+			}
 			Session ["state"] = state;
 			return state;
 		}
@@ -293,7 +307,7 @@ namespace Yavsc.Controllers
 				if (model.PreferedDate < mindate)
 					model.PreferedDate = mindate;
 				if (model.MaxDate < mindate)
-					model.MaxDate = mindate.AddYears (1);
+					model.MaxDate = mindate.AddYears (1).Date;
 
 				var muc = Membership.FindUsersByName (model.UserName);
 				if (muc.Count == 0) {
diff --git a/yavscModel/Google/AskForADate.cs b/yavscModel/Google/AskForADate.cs
index 5a227ad4..9813d087 100644
--- a/yavscModel/Google/AskForADate.cs
+++ b/yavscModel/Google/AskForADate.cs
@@ -29,13 +29,6 @@ namespace Yavsc.Model.Google
 	/// </summary>
 	public class AskForADate
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Yavsc.Model.Google.AskForADate"/> class.
-		/// </summary>
-		public AskForADate ()
-		{
-			 MaxDate = DateTime.Now.AddMinutes (5);
-		}
 
 		/// <summary>
 		/// Gets or sets the prefered date.