--- smeserver-openoffice-portable-2.3.1/root/etc/e-smith/events/actions/openoffice-usersettings.inifile	2008-03-14 20:42:41.000000000 +0100
+++ smeserver-openoffice-portable-2.3.1/root/etc/e-smith/events/actions/openoffice-usersettings	2008-03-14 20:41:17.000000000 +0100
@@ -57,6 +57,8 @@
 		system( "/bin/mv $bootstrap_ini $bootstrap_ini.orig") if not -f "$bootstrap_ini.orig";
 		system( "/bin/sed -e 's:UserInstallation=.*:UserInstallation=//$ServerName/ooUserSettings/\$USERNAME\r:' < $bootstrap_ini.orig > $bootstrap_ini");
 		}
+	my $OOP_ini ="/opt/openoffice/OpenOfficePortable/OpenOfficePortable.ini";
+	system("/bin/cp -a $OOP_ini.contrib $OOP_ini") if not -f $OOP_ini;
 	}
 elsif( $self eq "openoffice-assoc-oo" )
 	{
@@ -149,10 +151,11 @@
 	mkdir "$settings/$username" if not -d "$settings/$username";
 	chown $uid, $gid, "$settings/$username";
 	chmod 0700, "$settings/$username";
-	if( not -d "$settings/$username/user" && -d "/opt/openoffice/OpenOfficePortable/Data/settings/user" )
+	my $SDir="/opt/openoffice/OpenOfficePortable/Data/settings/user";
+	if( not -d "$settings/$username/user" && -d "$SDir" )
 		{
-		system( "/bin/rm -f /opt/openoffice/OpenOfficePortable/Data/settings/user/registry/cache/*" );
-		system( "/bin/cp -fR /opt/openoffice/OpenOfficePortable/Data/settings/user $settings/$username" );
+		system( "/bin/rm -f $SDir/registry/cache/*" );
+		system( "/bin/cp -fR $SDir $settings/$username" );
 		system( "/bin/chown -R $username.$username $settings/$username/user" );