Nearing feature complete for driver auth

Web/ViewModels/User/CreateUserViewModel.cs

@@ -5,8 +5,15 @@ using MileageTraker.Web.Attributes;
 
 namespace MileageTraker.Web.ViewModels.User
 {
-	public class CreateUserViewModel : RolesViewModel
+	public class CreateUserViewModel
 	{
+		[Required]
+		[StringLength(128)]
+		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
+		[InputSize("medium")]
+		[Remote("FullNameAvailable", "User", ErrorMessage = "Name already in use")]
+		public string FullName { get; set; }
+
 		[Required]
 		[StringLength(64)]
 		[InputSize("small")]
@@ -17,19 +24,14 @@ namespace MileageTraker.Web.ViewModels.User
 		[DataType(DataType.EmailAddress)]
 		[RegularExpression(@"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", ErrorMessage = "Must be an email address")]
 		[InputSize("large")]
-		[Remote("EmailAvailable", "User", ErrorMessage = "Email already in use")]
 		public string Email { get; set; }
 
-		[Required]
-		[StringLength(128)]
-		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
-		[InputSize("medium")]
-		public string FullName { get; set; }
+		public CheckBoxViewModel Roles { get; set; }
 
-		[Required, DataType(DataType.Password)]
-		[StringLength(16, MinimumLength = 6)]
-		[InputSize("medium")]
-		public string Password { get; set; }
+		[Required]
+		[Display(Name = "Set password now instead of emailing ")]
+		[NoEditLabel]
+		public bool SetPassword { get; set; }
 
 		static CreateUserViewModel()
 		{