diff --git a/src/main/java/de/dpunkt/myaktion/model/Campaign.java b/src/main/java/de/dpunkt/myaktion/model/Campaign.java
index d5cac29b985f1eceb67444f8ac3b92f5bd2b198c..87786285b173a93fee89eec769c7dfce6838a5df 100644
--- a/src/main/java/de/dpunkt/myaktion/model/Campaign.java
+++ b/src/main/java/de/dpunkt/myaktion/model/Campaign.java
@@ -5,7 +5,6 @@
 
 package de.dpunkt.myaktion.model;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 import javax.persistence.AttributeOverride;
@@ -41,10 +40,12 @@ import javax.xml.bind.annotation.XmlRootElement;
 @Entity
 @EntityListeners(EntityCreationListener.class)
 public class Campaign extends DateEntity {
+    //----------------------------------------------------------------------------------------------
+
     public static final String findByOrganizer = "Campaign.findByOrganizer";
-    
+
     public static final String findAll = "Campaign.findAll";
-    
+
     public static final String getAmountDonatedSoFar = "Campaign.getAmountDonatedSoFar";
 
     //==============================================================================================
@@ -59,14 +60,14 @@ public class Campaign extends DateEntity {
 
     @NotNull(message = "{campaign.targetAmount.notNull}")
     @DecimalMin(value = "10.00", message = "{campaign.targetAmount.decimalMin}")
-    private BigDecimal targetAmount;
+    private Double targetAmount;
 
     @NotNull(message = "{campaign.donationMinimum.notNull}")
     @DecimalMin(value = "1.00", message = "{campaign.donationMinimum.decimalMin}")
-    private BigDecimal donationMinimum;
+    private Double donationMinimum;
 
     @Transient
-    private BigDecimal amountDonatedSoFar;
+    private Double amountDonatedSoFar;
 
     @Embedded
     @AttributeOverrides({
@@ -87,6 +88,14 @@ public class Campaign extends DateEntity {
 
     //----------------------------------------------------------------------------------------------
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }
@@ -95,27 +104,27 @@ public class Campaign extends DateEntity {
         this.name = name;
     }
 
-    public BigDecimal getTargetAmount() {
+    public Double getTargetAmount() {
         return targetAmount;
     }
 
-    public void setTargetAmount(BigDecimal targetAmount) {
+    public void setTargetAmount(Double targetAmount) {
         this.targetAmount = targetAmount;
     }
 
-    public BigDecimal getDonationMinimum() {
+    public Double getDonationMinimum() {
         return donationMinimum;
     }
 
-    public void setDonationMinimum(BigDecimal donationMinimum) {
+    public void setDonationMinimum(Double donationMinimum) {
         this.donationMinimum = donationMinimum;
     }
 
-    public BigDecimal getAmountDonatedSoFar() {
+    public Double getAmountDonatedSoFar() {
         return amountDonatedSoFar;
     }
 
-    public void setAmountDonatedSoFar(BigDecimal amountDonatedSoFar) {
+    public void setAmountDonatedSoFar(Double amountDonatedSoFar) {
         this.amountDonatedSoFar = amountDonatedSoFar;
     }
 
@@ -127,14 +136,6 @@ public class Campaign extends DateEntity {
         this.account = account;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
     public List<Donation> getDonations() {
         return donations;
     }
diff --git a/src/main/java/de/dpunkt/myaktion/model/Donation.java b/src/main/java/de/dpunkt/myaktion/model/Donation.java
index b235701aebc974131461508a6abbe6ced73a702f..5f5a9ef1602cb59c9d9e4d1118fb55f365bd9f0e 100644
--- a/src/main/java/de/dpunkt/myaktion/model/Donation.java
+++ b/src/main/java/de/dpunkt/myaktion/model/Donation.java
@@ -5,8 +5,6 @@
 
 package de.dpunkt.myaktion.model;
 
-import java.math.BigDecimal;
-
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -28,16 +26,16 @@ public class Donation extends DateEntity {
     //----------------------------------------------------------------------------------------------
 
     public static final String findByStatus = "Donation.findByStatus";
-    
+
     //==============================================================================================
-    
+
     @GeneratedValue
     @Id
     private Long id;
 
     @NotNull(message = "{donation.amount.notNull}")
     @DecimalMin(value = "1.00", message = "{donation.amount.decimalMin}")
-    private BigDecimal amount;
+    private Double amount;
 
     @NotNull
     @Size(min = 5, max = 40, message = "{donation.donorName.size}")
@@ -79,11 +77,11 @@ public class Donation extends DateEntity {
         this.id = id;
     }
 
-    public BigDecimal getAmount() {
+    public Double getAmount() {
         return amount;
     }
 
-    public void setAmount(BigDecimal amount) {
+    public void setAmount(Double amount) {
         this.amount = amount;
     }
 
diff --git a/src/main/webapp/donateMoney.xhtml b/src/main/webapp/donateMoney.xhtml
index fdc2d93d0dd2e7c5cd0fc040d8c775b08c04bd31..000c3061c6eaafa8a89c5fc36a5904d6ad110d0d 100644
--- a/src/main/webapp/donateMoney.xhtml
+++ b/src/main/webapp/donateMoney.xhtml
@@ -54,8 +54,13 @@
             </h:outputLabel>
             <h:panelGroup>
                 <p:inputText id="donationAmount"
-                        value="#{donateMoneyController.donation.amount}">
-                    <f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+                        value="#{donateMoneyController.donation.amount}"
+                        onchange="
+                            if(value !== '') {
+                                if(value.indexOf('.') === -1) {
+                                    document.getElementById('j_idt8:tabView:donationAmount').value = value + '.00';
+                                }
+                            }">
                 </p:inputText> EUR
             </h:panelGroup>
             <p:message for="donationAmount" style="color: red;" />
diff --git a/src/main/webapp/organizer/editCampaign.xhtml b/src/main/webapp/organizer/editCampaign.xhtml
index 410f98699a9fd6914aad4e5d1777f008be3535b3..4d0a7f8d76ca30def6f2436d47dc35d6d8fb1e78 100644
--- a/src/main/webapp/organizer/editCampaign.xhtml
+++ b/src/main/webapp/organizer/editCampaign.xhtml
@@ -1,14 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:f="http://xmlns.jcp.org/jsf/core" 
-    xmlns:p="http://primefaces.org/ui"
+    xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"
     xmlns:h="http://xmlns.jcp.org/jsf/html">
 <body>
     <f:view contracts="#{view.locale.language}">
         <ui:composition template="/template.xhtml">
             <ui:define name="content">
-                <h1>#{addMode ?
-                    msg['editCampaign.add_new_campaign'] :
+                <h1>#{addMode ? msg['editCampaign.add_new_campaign'] :
                     msg['editCampaign.edit_campaign']}</h1>
                 <h:form>
                     <p:messages closable="true" />
@@ -29,9 +27,13 @@
                                 </h:outputLabel>
                                 <h:panelGroup>
                                     <p:inputText id="a_targetAmount"
-                                            value="#{selectedCampaign.targetAmount}">
-                                        <f:convertNumber maxFractionDigits="2"
-                                            minFractionDigits="2" />
+                                        value="#{selectedCampaign.targetAmount}"
+                                        onchange="
+                                        if(value !== '') {
+                                            if(value.indexOf('.') === -1) {
+                                                document.getElementById('j_idt8:tabView:a_targetAmount').value = value + '.00';
+                                            }
+                                        }">
                                     </p:inputText> EUR
                                 </h:panelGroup>
                                 <p:message for="a_targetAmount" />
@@ -40,9 +42,13 @@
                                 </h:outputLabel>
                                 <h:panelGroup>
                                     <p:inputText id="a_donationMinimum"
-                                            value="#{selectedCampaign.donationMinimum}">
-                                        <f:convertNumber maxFractionDigits="2"
-                                            minFractionDigits="2" />
+                                        value="#{selectedCampaign.donationMinimum}"
+                                        onchange="
+                                        if(value !== '') {
+                                            if(value.indexOf('.') === -1) {
+                                                document.getElementById('j_idt8:tabView:a_donationMinimum').value = value + '.00';
+                                            }
+                                        }">
                                     </p:inputText> EUR
                                 </h:panelGroup>
                                 <p:message for="a_donationMinimum" />
@@ -80,7 +86,7 @@
                         immediate="true" ajax="false"
                         action="#{editCampaignController.doCancel}" />
                 </h:form>
-            </ui:define>
+            </ui:define>    
         </ui:composition>
     </f:view>
 </body>