Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -r12277 -r12320
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12277)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12320)
@@ -1444,4 +1444,11 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseTemplateCompression', '0', 'In-Portal', 'in-portal:configure_advanced');
 UPDATE ConfigurationAdmin SET DisplayOrder = DisplayOrder + 0.01 WHERE VariableName IN ('TrimRequiredFields', 'UseCronForRegularEvent', 'UseChangeLog', 'Backup_Path', 'SystemTagCache', 'SocketBlockingMode');
 
+DELETE FROM ConfigurationAdmin WHERE VariableName = 'UseModalWindows';
+DELETE FROM ConfigurationValues WHERE VariableName = 'UseModalWindows';
+DELETE FROM Phrase WHERE Phrase = 'la_config_UseModalWindows';
+
+UPDATE ConfigurationAdmin SET element_type = 'select', ValueList = '0=la_opt_SameWindow,1=la_opt_PopupWindow,2=la_opt_ModalWindow' WHERE VariableName = 'UsePopups';
+UPDATE Phrase SET Translation = 'Editing Window Style' WHERE Phrase = 'la_config_UsePopups';
+
 UPDATE Modules SET Version = '5.0.1', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file