diff --git a/account.pb.go b/account.pb.go
index fddf525..19505f6 100644
--- a/account.pb.go
+++ b/account.pb.go
@@ -22,27 +22,28 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Account struct {
 	ID                   int64                 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
-	Nick                 string                `protobuf:"bytes,2,opt,name=nick,proto3" json:"nick,omitempty"`
+	Nick                 string                `protobuf:"bytes,2,opt,name=Nick,proto3" json:"Nick,omitempty"`
 	Username             string                `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"`
 	Token                string                `protobuf:"bytes,4,opt,name=token,proto3" json:"token,omitempty"`
-	Pwdhash              string                `protobuf:"bytes,5,opt,name=pwdhash,proto3" json:"pwdhash,omitempty"`
-	Hostname             string                `protobuf:"bytes,6,opt,name=hostname,proto3" json:"hostname,omitempty"`
-	Domain               string                `protobuf:"bytes,7,opt,name=domain,proto3" json:"domain,omitempty"`
-	Port                 int32                 `protobuf:"varint,8,opt,name=port,proto3" json:"port,omitempty"`
-	Email                string                `protobuf:"bytes,9,opt,name=email,proto3" json:"email,omitempty"`
-	URL                  string                `protobuf:"bytes,10,opt,name=URL,proto3" json:"URL,omitempty"`
-	Ctime                string                `protobuf:"bytes,11,opt,name=ctime,proto3" json:"ctime,omitempty"`
-	Mtime                string                `protobuf:"bytes,12,opt,name=mtime,proto3" json:"mtime,omitempty"`
-	Atime                string                `protobuf:"bytes,13,opt,name=atime,proto3" json:"atime,omitempty"`
-	Browser              string                `protobuf:"bytes,14,opt,name=browser,proto3" json:"browser,omitempty"`
-	HttpHeaders          []*Account_HttpHeader `protobuf:"bytes,15,rep,name=httpHeaders,proto3" json:"httpHeaders,omitempty"`
-	Code                 string                `protobuf:"bytes,16,opt,name=code,proto3" json:"code,omitempty"`
-	Codedate             string                `protobuf:"bytes,17,opt,name=codedate,proto3" json:"codedate,omitempty"`
-	Createdon            string                `protobuf:"bytes,18,opt,name=createdon,proto3" json:"createdon,omitempty"`
-	Codetype             string                `protobuf:"bytes,19,opt,name=codetype,proto3" json:"codetype,omitempty"`
-	Secret2Fa            string                `protobuf:"bytes,20,opt,name=secret2fa,proto3" json:"secret2fa,omitempty"`
-	Confirmed2Fa         string                `protobuf:"bytes,21,opt,name=confirmed2fa,proto3" json:"confirmed2fa,omitempty"`
-	Roles                string                `protobuf:"bytes,22,opt,name=roles,proto3" json:"roles,omitempty"`
+	Password             string                `protobuf:"bytes,5,opt,name=password,proto3" json:"password,omitempty"`
+	Pwdhash              string                `protobuf:"bytes,6,opt,name=pwdhash,proto3" json:"pwdhash,omitempty"`
+	Hostname             string                `protobuf:"bytes,7,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	Domain               string                `protobuf:"bytes,8,opt,name=domain,proto3" json:"domain,omitempty"`
+	Port                 int32                 `protobuf:"varint,9,opt,name=port,proto3" json:"port,omitempty"`
+	Email                string                `protobuf:"bytes,10,opt,name=email,proto3" json:"email,omitempty"`
+	URL                  string                `protobuf:"bytes,11,opt,name=URL,proto3" json:"URL,omitempty"`
+	Ctime                string                `protobuf:"bytes,12,opt,name=ctime,proto3" json:"ctime,omitempty"`
+	Mtime                string                `protobuf:"bytes,13,opt,name=mtime,proto3" json:"mtime,omitempty"`
+	Atime                string                `protobuf:"bytes,14,opt,name=atime,proto3" json:"atime,omitempty"`
+	Browser              string                `protobuf:"bytes,15,opt,name=browser,proto3" json:"browser,omitempty"`
+	HttpHeaders          []*Account_HttpHeader `protobuf:"bytes,16,rep,name=httpHeaders,proto3" json:"httpHeaders,omitempty"`
+	Code                 string                `protobuf:"bytes,17,opt,name=code,proto3" json:"code,omitempty"`
+	Codedate             string                `protobuf:"bytes,18,opt,name=codedate,proto3" json:"codedate,omitempty"`
+	Createdon            string                `protobuf:"bytes,19,opt,name=createdon,proto3" json:"createdon,omitempty"`
+	Codetype             string                `protobuf:"bytes,20,opt,name=codetype,proto3" json:"codetype,omitempty"`
+	Secret2Fa            string                `protobuf:"bytes,21,opt,name=secret2fa,proto3" json:"secret2fa,omitempty"`
+	Confirmed2Fa         string                `protobuf:"bytes,22,opt,name=confirmed2fa,proto3" json:"confirmed2fa,omitempty"`
+	Roles                string                `protobuf:"bytes,23,opt,name=roles,proto3" json:"roles,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
 	XXX_unrecognized     []byte                `json:"-"`
 	XXX_sizecache        int32                 `json:"-"`
@@ -101,6 +102,13 @@ func (m *Account) GetToken() string {
 	return ""
 }
 
+func (m *Account) GetPassword() string {
+	if m != nil {
+		return m.Password
+	}
+	return ""
+}
+
 func (m *Account) GetPwdhash() string {
 	if m != nil {
 		return m.Pwdhash
@@ -282,30 +290,30 @@ func init() {
 func init() { proto.RegisterFile("account.proto", fileDescriptor_8e28828dcb8d24f0) }
 
 var fileDescriptor_8e28828dcb8d24f0 = []byte{
-	// 386 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xcf, 0xab, 0xda, 0x40,
-	0x10, 0xc7, 0x89, 0x79, 0xd1, 0xe7, 0xe6, 0xbd, 0xd7, 0xd7, 0xad, 0x95, 0x41, 0x0a, 0x0d, 0x9e,
-	0x72, 0xca, 0xc1, 0x42, 0xef, 0x82, 0x07, 0x85, 0x1e, 0x4a, 0xa0, 0x7f, 0xc0, 0xba, 0x19, 0x49,
-	0xd0, 0x64, 0xc3, 0x66, 0x53, 0xe9, 0xb5, 0x7f, 0x79, 0x99, 0xd9, 0x44, 0xed, 0xc9, 0xf9, 0x7c,
-	0xe7, 0xc7, 0x3a, 0xdf, 0x8c, 0x78, 0x55, 0x5a, 0x9b, 0xbe, 0x71, 0x59, 0x6b, 0x8d, 0x33, 0x32,
-	0xbe, 0x56, 0xee, 0x27, 0x45, 0xc7, 0xfe, 0xb4, 0xfe, 0x1b, 0x89, 0xd9, 0xd6, 0xa7, 0xe5, 0x9b,
-	0x98, 0x1c, 0x76, 0x10, 0x24, 0x41, 0x1a, 0xe6, 0x93, 0xc3, 0x4e, 0x4a, 0xf1, 0xd4, 0x54, 0xfa,
-	0x0c, 0x93, 0x24, 0x48, 0xe7, 0x39, 0xc7, 0x72, 0x25, 0x9e, 0xfb, 0x0e, 0x6d, 0xa3, 0x6a, 0x84,
-	0x90, 0xf5, 0x1b, 0xcb, 0x85, 0x88, 0x9c, 0x39, 0x63, 0x03, 0x4f, 0x9c, 0xf0, 0x20, 0x41, 0xcc,
-	0xda, 0x6b, 0x51, 0xaa, 0xae, 0x84, 0x88, 0xf5, 0x11, 0x69, 0x56, 0x69, 0x3a, 0xc7, 0xb3, 0xa6,
-	0x7e, 0xd6, 0xc8, 0x72, 0x29, 0xa6, 0x85, 0xa9, 0x55, 0xd5, 0xc0, 0x8c, 0x33, 0x03, 0xd1, 0x7f,
-	0x6a, 0x8d, 0x75, 0xf0, 0x9c, 0x04, 0x69, 0x94, 0x73, 0x4c, 0xef, 0x62, 0xad, 0xaa, 0x0b, 0xcc,
-	0xfd, 0xbb, 0x0c, 0xf2, 0x5d, 0x84, 0xbf, 0xf2, 0x1f, 0x20, 0x58, 0xa3, 0x90, 0xea, 0xb4, 0xab,
-	0x6a, 0x84, 0xd8, 0xd7, 0x31, 0x90, 0x5a, 0xb3, 0xfa, 0xe2, 0xd5, 0x7a, 0x54, 0x15, 0xab, 0xaf,
-	0x5e, 0x65, 0xa0, 0x5d, 0x8e, 0xd6, 0x5c, 0x3b, 0xb4, 0xf0, 0xe6, 0x77, 0x19, 0x50, 0x6e, 0x45,
-	0x5c, 0x3a, 0xd7, 0xee, 0x51, 0x15, 0x68, 0x3b, 0xf8, 0x90, 0x84, 0x69, 0xbc, 0xf9, 0x9a, 0x3d,
-	0x58, 0x9d, 0x0d, 0x36, 0x67, 0xfb, 0x5b, 0x5d, 0xfe, 0xd8, 0x43, 0xab, 0x69, 0x53, 0x20, 0xbc,
-	0x7b, 0xbb, 0x29, 0x26, 0x8b, 0xe8, 0xb7, 0x50, 0x0e, 0xe1, 0xa3, 0xb7, 0x68, 0x64, 0xf9, 0x45,
-	0xcc, 0xb5, 0x45, 0xe5, 0xb0, 0x30, 0x0d, 0x48, 0x4e, 0xde, 0x85, 0xb1, 0xd3, 0xfd, 0x69, 0x11,
-	0x3e, 0xdd, 0x3b, 0x89, 0xa9, 0xb3, 0x43, 0x6d, 0xd1, 0x6d, 0x4e, 0x0a, 0x16, 0xbe, 0xf3, 0x26,
-	0xc8, 0xb5, 0x78, 0xd1, 0xa6, 0x39, 0x55, 0xb6, 0xc6, 0x82, 0x0a, 0x3e, 0x73, 0xc1, 0x7f, 0x1a,
-	0xd9, 0x63, 0xcd, 0x05, 0x3b, 0x58, 0x7a, 0x7b, 0x18, 0x56, 0xdf, 0x85, 0xb8, 0x2f, 0xc7, 0xe7,
-	0x43, 0x9f, 0x36, 0x18, 0xce, 0x67, 0x38, 0x91, 0xdf, 0xea, 0xd2, 0xe3, 0x70, 0x53, 0x1e, 0x8e,
-	0x53, 0x3e, 0xcc, 0x6f, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xf0, 0xf6, 0xdb, 0xa9, 0x02,
-	0x00, 0x00,
+	// 398 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xcf, 0x6a, 0xdc, 0x30,
+	0x10, 0xc6, 0xf1, 0x3a, 0xde, 0xcd, 0xca, 0x49, 0x9a, 0xaa, 0x69, 0x3a, 0x84, 0x42, 0x4d, 0x4e,
+	0x3e, 0xf9, 0x90, 0x42, 0xef, 0x81, 0x1c, 0x12, 0x28, 0xa5, 0x18, 0xfa, 0x00, 0x5a, 0x69, 0x16,
+	0x9b, 0xac, 0x2d, 0x23, 0xc9, 0x35, 0x7d, 0x99, 0x3e, 0x6b, 0x99, 0x91, 0xbd, 0x9b, 0x9e, 0x3c,
+	0xbf, 0x6f, 0xe6, 0xc3, 0x9a, 0x3f, 0xe2, 0x52, 0x69, 0x6d, 0xc7, 0x3e, 0x54, 0x83, 0xb3, 0xc1,
+	0xca, 0x7c, 0x6a, 0xc3, 0x4f, 0x8a, 0x76, 0xe3, 0xfe, 0xfe, 0x6f, 0x26, 0x36, 0x8f, 0x31, 0x2d,
+	0xaf, 0xc4, 0xea, 0xe5, 0x09, 0x92, 0x22, 0x29, 0xd3, 0x7a, 0xf5, 0xf2, 0x24, 0xa5, 0x38, 0xfb,
+	0xd1, 0xea, 0x57, 0x58, 0x15, 0x49, 0xb9, 0xad, 0x39, 0x96, 0x77, 0xe2, 0x7c, 0xf4, 0xe8, 0x7a,
+	0xd5, 0x21, 0xa4, 0xac, 0x1f, 0x59, 0xde, 0x88, 0x2c, 0xd8, 0x57, 0xec, 0xe1, 0x8c, 0x13, 0x11,
+	0xc8, 0x31, 0x28, 0xef, 0x27, 0xeb, 0x0c, 0x64, 0xd1, 0xb1, 0xb0, 0x04, 0xb1, 0x19, 0x26, 0xd3,
+	0x28, 0xdf, 0xc0, 0x9a, 0x53, 0x0b, 0x92, 0xab, 0xb1, 0x3e, 0xf0, 0x7f, 0x36, 0xd1, 0xb5, 0xb0,
+	0xbc, 0x15, 0x6b, 0x63, 0x3b, 0xd5, 0xf6, 0x70, 0xce, 0x99, 0x99, 0xe8, 0xbd, 0x83, 0x75, 0x01,
+	0xb6, 0x45, 0x52, 0x66, 0x35, 0xc7, 0xf4, 0x26, 0xec, 0x54, 0x7b, 0x00, 0x11, 0xdf, 0xc4, 0x20,
+	0xaf, 0x45, 0xfa, 0xab, 0xfe, 0x0e, 0x39, 0x6b, 0x14, 0x52, 0x9d, 0x0e, 0x6d, 0x87, 0x70, 0x11,
+	0xeb, 0x18, 0x48, 0xed, 0x58, 0xbd, 0x8c, 0x6a, 0xb7, 0xa8, 0x8a, 0xd5, 0xab, 0xa8, 0x32, 0x50,
+	0x2f, 0x3b, 0x67, 0x27, 0x8f, 0x0e, 0xde, 0xc5, 0x5e, 0x66, 0x94, 0x8f, 0x22, 0x6f, 0x42, 0x18,
+	0x9e, 0x51, 0x19, 0x74, 0x1e, 0xae, 0x8b, 0xb4, 0xcc, 0x1f, 0xbe, 0x54, 0x6f, 0xd6, 0x50, 0xcd,
+	0x2b, 0xa8, 0x9e, 0x8f, 0x75, 0xf5, 0x5b, 0x0f, 0xb5, 0xa6, 0xad, 0x41, 0x78, 0x1f, 0x57, 0x41,
+	0x31, 0x8d, 0x88, 0xbe, 0x46, 0x05, 0x04, 0x19, 0x47, 0xb4, 0xb0, 0xfc, 0x2c, 0xb6, 0xda, 0xa1,
+	0x0a, 0x68, 0x6c, 0x0f, 0x1f, 0x38, 0x79, 0x12, 0x16, 0x67, 0xf8, 0x33, 0x20, 0xdc, 0x9c, 0x9c,
+	0xc4, 0xe4, 0xf4, 0xa8, 0x1d, 0x86, 0x87, 0xbd, 0x82, 0x8f, 0xd1, 0x79, 0x14, 0xe4, 0xbd, 0xb8,
+	0xd0, 0xb6, 0xdf, 0xb7, 0xae, 0x43, 0x43, 0x05, 0xb7, 0x5c, 0xf0, 0x9f, 0x46, 0xe3, 0x71, 0xf6,
+	0x80, 0x1e, 0x3e, 0xc5, 0xf1, 0x30, 0xdc, 0x7d, 0x13, 0xe2, 0xd4, 0x1c, 0xf5, 0xc3, 0xab, 0x4d,
+	0x62, 0x3f, 0xcb, 0xf9, 0xfc, 0x56, 0x87, 0x11, 0xe7, 0x7b, 0x8b, 0xb0, 0x5b, 0xf3, 0xd1, 0x7e,
+	0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x73, 0x24, 0x9b, 0xc5, 0x02, 0x00, 0x00,
 }
diff --git a/account.proto b/account.proto
index ee380a6..c51ebeb 100644
--- a/account.proto
+++ b/account.proto
@@ -3,31 +3,35 @@
 syntax = "proto3";
 package witProtobuf;
 
+//import "Common.proto";
+//import "google/protobuf/timestamp.proto";
+
 message Account {
-	int64  ID	= 1;
-	string nick	= 2;
+	int64  ID	= 1; //`db:"id"`
+	string Nick	= 2; // db:"id"
 	string username	= 3;
 	string token	= 4;
-	string pwdhash	= 5;
-	string hostname	= 6;
-	string domain	= 7;
-	int32  port	= 8;
-	string email	= 9;
-	string URL	= 10;
+	string password	= 5;
+	string pwdhash	= 6;
+	string hostname	= 7;
+	string domain	= 8;
+	int32  port	= 9;
+	string email	= 10;
+	string URL	= 11;
 
-	string ctime	= 11;
-	string mtime	= 12;
-	string atime	= 13;
+	string ctime	= 12;
+	string mtime	= 13;
+	string atime	= 14;
 
-	string browser	= 14;
-	repeated HttpHeader httpHeaders = 15;
-	string code = 16;
-	string codedate = 17;
-	string createdon = 18;
-	string codetype = 19;
-	string secret2fa = 20;
-	string confirmed2fa = 21;
-	string roles = 22;
+	string browser	= 15;
+	repeated HttpHeader httpHeaders = 16;
+	string code = 17;
+	string codedate = 18;
+	string createdon = 19;
+	string codetype = 20;
+	string secret2fa = 21;
+	string confirmed2fa = 22;
+	string roles = 23;
 	
 
 	message HttpHeader {