diff --git a/lib/admin/Controller/billing.pm b/lib/admin/Controller/billing.pm
index 98c55a2..66fb425 100644
--- a/lib/admin/Controller/billing.pm
+++ b/lib/admin/Controller/billing.pm
@@ -291,6 +291,17 @@ sub do_edit_bilprof : Local {
         $settings{interval_free_cash} = 0;
     }
 
+    $settings{currency} = $c->request->params->{currency} || '';
+
+    $settings{vat_rate} = $c->request->params->{vat_rate};
+    if(length $settings{vat_rate}) {
+        $messages{vat_rate} = 'Web.Syntax.Numeric'
+            unless $settings{vat_rate} =~ /^\d+$/;
+    } else {
+        $settings{vat_rate} = 0;
+    }
+
+    $settings{vat_included} = $c->request->params->{vat_included} ? 1 : 0;
 
     unless(keys %messages) {
         if($bilprof) {
diff --git a/root/tt/bilprof_edit.tt b/root/tt/bilprof_edit.tt
index 8d21650..febb487 100644
--- a/root/tt/bilprof_edit.tt
+++ b/root/tt/bilprof_edit.tt
@@ -85,6 +85,31 @@
                 </td>
               </tr>
               [% IF messages.free_cash %]<tr><td /><td><div class="errormsg">[% messages.free_cash %]</div></td></tr>[% END %]
+              <tr>
+                <td class="tdkey">currency:</td>
+                <td>
+                  <input type="text" name="currency" title="string, will be used on invoices and webinterfaces"
+                         value="[% bilprof.data.currency %]" />
+                  currency symbol or ISO code
+                </td>
+              </tr>
+              [% IF messages.currency %]<tr><td /><td><div class="errormsg">[% messages.currency %]</div></td></tr>[% END %]
+              <tr>
+                <td class="tdkey">VAT rate:</td>
+                <td>
+                  <input type="text" name="vat_rate" title="integer, specifying the percentage"
+                         value="[% bilprof.data.vat_rate %]" />
+                  %
+                </td>
+              </tr>
+              [% IF messages.vat_rate %]<tr><td /><td><div class="errormsg">[% messages.vat_rate %]</div></td></tr>[% END %]
+              <tr>
+                <td class="tdkey">VAT included:</td>
+                <td>
+                  <input type="checkbox" class="checkbox" name="vat_included" title="check if fees are inclusive VAT"
+                         [% IF bilprof.data.vat_included %]checked="checked"[% END %] />
+                </td>
+              </tr>
             </table>
             <input type="submit" class="but" value="Save &#187;" />
           </form>