diff --git a/whinepad2/js/source/components/Form.js b/whinepad2/js/source/components/Form.js
index 8d60048..51cb3ca 100755
--- a/whinepad2/js/source/components/Form.js
+++ b/whinepad2/js/source/components/Form.js
@@ -13,21 +13,21 @@ type Props = {
 };
 
 class Form extends Component {
-  
+
   props: Props;
-  
+
   getData(): Object {
     let data: Object = {};
-    this.props.fields.forEach((field: FormInputField) => 
+    this.props.fields.forEach((field: FormInputField) =>
       data[field.id] = this.refs[field.id].getValue()
     );
     return data;
   }
-  
+
   render() {
     return (
       <form className="Form">{this.props.fields.map((field: FormInputField) => {
-        const prefilled: FormInputFieldValue = (this.props.initialData && this.props.initialData[field.id]) || '';
+        const prefilled: ?FormInputFieldValue = this.props.initialData && this.props.initialData[field.id];
         if (!this.props.readonly) {
           return (
             <div className="FormRow" key={field.id}>
diff --git a/whinepad2/js/source/components/FormInput.js b/whinepad2/js/source/components/FormInput.js
index 8906ce2..8abe9e5 100755
--- a/whinepad2/js/source/components/FormInput.js
+++ b/whinepad2/js/source/components/FormInput.js
@@ -17,9 +17,9 @@ export type FormInputField = {
 };
 
 class FormInput extends Component {
-  
+
   props: FormInputField;
-  
+
   static defaultProps = {
     type: 'input',
   };
@@ -41,7 +41,7 @@ class FormInput extends Component {
         return (
           <input
             {...common}
-            type="number" 
+            type="number"
             defaultValue={this.props.defaultValue || new Date().getFullYear()} />
         );
       case 'suggest':
@@ -50,7 +50,7 @@ class FormInput extends Component {
         return (
           <Rating
             {...common}
-            defaultValue={parseInt(this.props.defaultValue, 10)} />
+            defaultValue={this.props.defaultValue} />
         );
       case 'text':
         return <textarea {...common} />;
diff --git a/whinepad3/js/source/components/Form.js b/whinepad3/js/source/components/Form.js
index 2dc716b..ef1669d 100755
--- a/whinepad3/js/source/components/Form.js
+++ b/whinepad3/js/source/components/Form.js
@@ -13,10 +13,10 @@ type Props = {
 };
 
 class Form extends Component {
-  
+
   fields: Array<Object>;
   initialData: ?Object;
-  
+
   constructor(props: Props) {
     super(props);
     this.fields = CRUDStore.getSchema();
@@ -24,19 +24,19 @@ class Form extends Component {
       this.initialData = CRUDStore.getRecord(this.props.recordId);
     }
   }
-  
+
   getData(): Object {
     let data: Object = {};
-    this.fields.forEach((field: FormInputField) => 
+    this.fields.forEach((field: FormInputField) =>
       data[field.id] = this.refs[field.id].getValue()
     );
     return data;
   }
-  
+
   render() {
     return (
       <form className="Form">{this.fields.map((field: FormInputField) => {
-        const prefilled: FormInputFieldValue = (this.initialData && this.initialData[field.id]) || '';
+        const prefilled: ?FormInputFieldValue = this.initialData && this.initialData[field.id];
         if (!this.props.readonly) {
           return (
             <div className="FormRow" key={field.id}>
diff --git a/whinepad3/js/source/components/FormInput.js b/whinepad3/js/source/components/FormInput.js
index 56ceccc..8abe9e5 100755
--- a/whinepad3/js/source/components/FormInput.js
+++ b/whinepad3/js/source/components/FormInput.js
@@ -17,13 +17,13 @@ export type FormInputField = {
 };
 
 class FormInput extends Component {
-  
+
   props: FormInputField;
-  
+
   static defaultProps = {
     type: 'input',
   };
-    
+
   getValue(): FormInputFieldValue {
     return 'value' in this.refs.input
       ? this.refs.input.value
@@ -41,7 +41,7 @@ class FormInput extends Component {
         return (
           <input
             {...common}
-            type="number" 
+            type="number"
             defaultValue={this.props.defaultValue || new Date().getFullYear()} />
         );
       case 'suggest':
@@ -50,7 +50,7 @@ class FormInput extends Component {
         return (
           <Rating
             {...common}
-            defaultValue={parseInt(this.props.defaultValue, 10)} />
+            defaultValue={this.props.defaultValue} />
         );
       case 'text':
         return <textarea {...common} />;