--- cui/source/inc/cuioptgenrl.hxx	(revision 1593540)
+++ cui/source/inc/cuioptgenrl.hxx	(working copy)
@@ -64,8 +64,6 @@ 
 	using TabPage::DeactivatePage;
 private:
     FixedLine           aAddrFrm;
-	FixedText 			aCompanyLbl;
-    SvxUserEdit         aCompanyEdit;
 	FixedText 			aNameLbl;
 	FixedText 			aNameLblRuss;
 	FixedText 			aNameLblEastern;
@@ -73,6 +71,8 @@ 
     SvxUserEdit         aFatherName;
     SvxUserEdit         aName;
     SvxUserEdit         aShortName;
+    FixedText           aCompanyLbl;
+    SvxUserEdit         aCompanyEdit;
 	FixedText 			aStreetLbl;
 	FixedText 			aStreetLblRuss;
     SvxUserEdit         aStreetEdit;
--- cui/source/options/optgenrl.src	(revision 1593540)
+++ cui/source/options/optgenrl.src	(working copy)
@@ -41,7 +41,7 @@ 
 	Text [ en-US ] = "User Data" ;
 	FixedText FT_COMPANY
 	{
-		Pos = MAP_APPFONT ( LEFT , FLINE ( 0 ) ) ;
+		Pos = MAP_APPFONT ( LEFT , FLINE ( 1 ) ) ;
         Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
 		LeftLabel = TRUE ;
 		Text [ en-US ] = "~Company" ;
@@ -50,19 +50,19 @@ 
 	{
 	    HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY";
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ;
+		Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
 		Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
 	};
 	FixedText FT_NAME
 	{
-		Pos = MAP_APPFONT ( LEFT , FLINE ( 1 ) ) ;
+		Pos = MAP_APPFONT ( LEFT , FLINE ( 0 ) ) ;
         Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
 		LeftLabel = TRUE ;
 		Text [ en-US ] = "First/Last ~name/Initials" ;
 	};
 	FixedText FT_NAME_RUSS
 	{
-		Pos = MAP_APPFONT ( LEFT , FLINE ( 1 ) ) ;
+		Pos = MAP_APPFONT ( LEFT , FLINE ( 0 ) ) ;
         Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
 		LeftLabel = TRUE ;
 		Hide = TRUE;
@@ -70,7 +70,7 @@ 
 	};
 	FixedText FT_NAME_EASTERN
 	{
-		Pos = MAP_APPFONT ( LEFT , FLINE ( 1 ) ) ;
+		Pos = MAP_APPFONT ( LEFT , FLINE ( 0 ) ) ;
         Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
 		LeftLabel = TRUE ;
 		Hide = TRUE;
@@ -81,28 +81,28 @@ 
 	    HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME";
 		Border = TRUE ;
 		Hide = TRUE;
-		Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
+		Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ;
 		Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
 	};
 	Edit ED_FIRSTNAME
 	{
 	    HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME";
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
+		Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ;
 		Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
 	};
 	Edit ED_NAME
 	{
 	    HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME";
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( MID+NAMELEN-8+HSPACE , LINE ( 1 ) ) ;
+		Pos = MAP_APPFONT ( MID+NAMELEN-8+HSPACE , LINE ( 0 ) ) ;
 		Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
 	};
 	Edit ED_SHORTNAME
 	{
 	    HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME";
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( MID+2* ( NAMELEN-8+HSPACE ) , LINE ( 1 ) ) ;
+		Pos = MAP_APPFONT ( MID+2* ( NAMELEN-8+HSPACE ) , LINE ( 0 ) ) ;
 		Size = MAP_APPFONT ( RIGHT- ( MID+2* ( NAMELEN-8+HSPACE ) ) , LINEH ) ;
 	};
 	FixedText FT_STREET