diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index c838a300a..82afb826d 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -3196,6 +3196,11 @@ class e_admin_controller_ui extends e_admin_controller
 						$value = implode(',', $value);
 					}
 				break;
+				
+				case 'images':
+					//XXX FIXME - entities in stored result. 
+				break;
+				
 	
 			}
 	
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 3f1474c62..63b1450eb 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -3168,6 +3168,19 @@ class e_form
 				$ret =  $this->imagepicker($key, $value, defset($label, $label), $parms);
 			break;
 			
+			case 'images':
+				
+				$value = str_replace(''',"'",html_entity_decode($value)); //FIXME @SecretR Horrible workaround to Line 3203 of admin_ui.php				
+				$ival = e107::unserialize($value);
+
+				for ($i=0; $i < 5; $i++) 
+				{
+					$k = $key.'[path]['.$i.']'; 
+					$ret .=  $this->imagepicker($k, $ival['path'][$i], defset($label, $label), $parms);		
+				}
+				
+			break;
+			
 			case 'file': //TODO - thumb, image list shortcode, js tooltip...
 				$label = varset($parms['label'], 'LAN_EDIT');
 				unset($parms['label']);