Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.dfm
===================================================================
--- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.dfm	(revision 496)
+++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.dfm	(revision 498)
@@ -102,5 +102,4 @@
         Anchors = [akTop, akRight]
         Caption = 'Prefix'
-        Visible = False
       end
       object SuffixLabel: TLabel
@@ -142,5 +141,4 @@
         Anchors = [akTop, akRight]
         Caption = 'Degree'
-        Visible = False
       end
       object Label1: TLabel
@@ -208,5 +206,4 @@
         Anchors = [akTop, akRight]
         TabOrder = 8
-        Visible = False
         OnChange = PrefixEditChange
       end
@@ -407,5 +404,5 @@
           Height = 21
           ItemHeight = 13
-          TabOrder = 6
+          TabOrder = 5
           Text = '<State>'
           OnChange = StateComboBoxChange
@@ -468,5 +465,5 @@
           Width = 121
           Height = 21
-          TabOrder = 5
+          TabOrder = 6
           OnChange = Zip4EditChange
         end
@@ -540,5 +537,4 @@
         Anchors = [akTop, akRight]
         TabOrder = 9
-        Visible = False
         OnChange = DegreeEditChange
       end
@@ -578,9 +574,9 @@
         Left = 415
         Top = 168
-        Width = 218
+        Width = 242
         Height = 21
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 13
-        OnChange = SSNumEditChange
+        OnChange = EMailEditChange
       end
     end
Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.pas
===================================================================
--- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.pas	(revision 496)
+++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtDemoEdit.pas	(revision 498)
@@ -118,5 +118,4 @@
     DegreeLabel: TLabel;
     AddAliasBtn: TButton;
-    DKLanguageController1: TDKLanguageController;
     GroupBox1: TGroupBox;
     PhoneNumGrp: TRadioGroup;
@@ -125,4 +124,5 @@
     Label2: TLabel;
     Label3: TLabel;
+    DKLanguageController1: TDKLanguageController;
     EMailEdit: TEdit;
     procedure AliasComboBoxChange(Sender: TObject);
@@ -140,4 +140,5 @@
     procedure SuffixEditChange(Sender: TObject);
     procedure SexComboBoxChange(Sender: TObject);
+    procedure EMailEditChange(Sender: TObject);
     procedure AddressLine1EditChange(Sender: TObject);
     procedure AddressLine2EditChange(Sender: TObject);
@@ -342,4 +343,5 @@
   PhoneNumTemp:=Source.PhoneNumTemp;
   Sex:=Source.Sex;
+  EMail := Source.EMail;
 end;
 
@@ -967,4 +969,12 @@
 end;
 
+procedure TfrmPtDemoEdit.EMailEditChange(Sender: TObject);
+begin
+  if ProgNameChangeOccuring = false then begin
+    FCurPatientInfo.EMail := EMailEdit.Text;
+    SetModified(true);
+  end;
+end;
+
 procedure TfrmPtDemoEdit.SexComboBoxChange(Sender: TObject);
 begin