diff --git a/lcl/include/customedit.inc b/lcl/include/customedit.inc
index cbf52eedeb..36b68fcc33 100644
--- a/lcl/include/customedit.inc
+++ b/lcl/include/customedit.inc
@@ -38,6 +38,12 @@ begin
   end;
 end;
 
+procedure TCustomEdit.CreateWnd;
+begin
+  inherited CreateWnd;
+  CNSendMessage(LM_SETPROPERTIES, Self, nil);
+end;
+
 {------------------------------------------------------------------------------
   Method:  TCustomEdit.Create
   Params:  none
@@ -222,6 +228,7 @@ procedure TCustomEdit.SetEchoMode(Val : TEchoMode);
 begin
   if (Val <> FEchoMode) then begin
     FEchoMode:= Val;
+writeln('TCustomEdit.SetEchoMode ',FEchoMode=emPassword,' ',HandleAllocated);
     if HandleAllocated then
       CNSendMessage(LM_SETPROPERTIES, Self, nil);
   end;
@@ -303,6 +310,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.15  2002/12/22 23:25:34  mattias
+  fixed setting TEdit properties after creating handle
+
   Revision 1.14  2002/12/12 17:47:46  mattias
   new constants for compatibility
 
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index 478c70e8d6..65b534103c 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -437,6 +437,7 @@ type
     procedure SetReadOnly(Value : Boolean);
   Protected
     Procedure DoAutoSize; Override;
+    procedure CreateWnd; override;
 
     procedure CMTextChanged(Var Message : TLMessage); message CM_TextChanged;
     procedure Change; dynamic;
@@ -1386,6 +1387,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.70  2002/12/22 23:25:34  mattias
+  fixed setting TEdit properties after creating handle
+
   Revision 1.69  2002/12/12 17:47:45  mattias
   new constants for compatibility