diff --git a/bin/Site/BrickEdit.html b/bin/Site/BrickEdit.html
index 660ab4f85e1b5fa06c5eb41285b4bf8be71239b1..5353665b61362092e20d178bf2f2c5c1929c21fa 100644
--- a/bin/Site/BrickEdit.html
+++ b/bin/Site/BrickEdit.html
@@ -17,8 +17,8 @@
         {if isset($params.customfields)}
         {foreach $params.customfields as $key => $field}
 
-            {if isset($params.availableSettings.$key)}
-            {assign var=setting value=$params.availableSettings.$key}
+        {foreach $params.availableSettings as $setting}
+            {if $setting.name == $field}
             <tr class="{cycle values="even,odd"}">
                 <td>
                     <label for="{$setting.name}">
@@ -57,6 +57,7 @@
             </tr>
             {/if}
 
+            {/foreach}
         {/foreach}
         {/if}
 
diff --git a/locale.xml b/locale.xml
index 1e620d65c9560c013ec548d8896525fc3d600d21..bbf5b727e2aed506bf97cc190d8bf34963ecd61b 100644
--- a/locale.xml
+++ b/locale.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <locales>
     <groups name="quiqqer/bricks" datatype="php,js">
+
         <locale name="permission.quiqqer.bricks._header">
             <de><![CDATA[Bausteine]]></de>
             <en><![CDATA[Bricks]]></en>