diff --git a/src/js/Field.js b/src/js/Field.js
index bdb181d85..2c27817e8 100644
--- a/src/js/Field.js
+++ b/src/js/Field.js
@@ -128,6 +128,14 @@
                 this.showingDefaultData = true;
             }
 
+            if(!Alpaca.isValEmpty(this.data) &&
+                !Alpaca.isEmpty(this.options["prefix"]) &&
+                !Alpaca.startsWith(this.data, this.options["prefix"])){
+                this.data = `${this.options["prefix"]}${this.data}`
+            }
+
+
+
             // default path
             this.path = "/";
 
diff --git a/src/js/fields/advanced/CurrencyField.js b/src/js/fields/advanced/CurrencyField.js
index 05ab7ebba..e7689f666 100644
--- a/src/js/fields/advanced/CurrencyField.js
+++ b/src/js/fields/advanced/CurrencyField.js
@@ -34,7 +34,6 @@
          */
         constructor: function(container, data, options, schema, view, connector, errorCallback) {
             options = options || {};
-
             var pfOptionsSchema = this.getSchemaOfPriceFormatOptions().properties;
             for (var i in pfOptionsSchema) {
                 var option = pfOptionsSchema[i];
@@ -46,8 +45,7 @@
             // Default should be true.
             options.allowOptionalEmpty = true;
             options.clearOnEmpty = true;
-
-            if (typeof(data) !== "undefined")
+            if (data!=null && typeof(data) !== "undefined")
             {
                 data = "" + parseFloat(data).toFixed(options.centsLimit);
             }
@@ -86,7 +84,6 @@
         getControlValue: function() {
 
             var field = this.getControlEl();
-
             var val = $(field).is('input') ? field.val() : field.html();
             if (this.options.unmask || this.options.round !== "none") {
                 var unmasked = function() {