diff --git a/src/components.js b/src/components.js
index 17e9af0c5c..8f1fb5c811 100644
--- a/src/components.js
+++ b/src/components.js
@@ -7,6 +7,8 @@ export * from 'ionic2/components/checkbox/checkbox'
 export * from 'ionic2/components/content/content'
 export * from 'ionic2/components/icon/icon'
 export * from 'ionic2/components/item/item'
+export * from 'ionic2/components/form/form'
+export * from 'ionic2/components/input/input'
 export * from 'ionic2/components/layout/layout'
 export * from 'ionic2/components/list/list'
 export * from 'ionic2/components/nav-pane/nav-pane'
diff --git a/src/components/app/test/barkpark/main.js b/src/components/app/test/barkpark/main.js
index ee8bf3f1e9..2c9c56a7cc 100644
--- a/src/components/app/test/barkpark/main.js
+++ b/src/components/app/test/barkpark/main.js
@@ -11,7 +11,7 @@ import {NavViewport, View, Button, Input} from 'ionic2/ionic2'
 })
 @Template({
   url: 'pages/login.html',
-  directives: [View, FormDirectives, Button]
+  directives: [View, FormDirectives, Button, Input]
 })
 export class LoginPage {
   constructor( @Parent() viewport: NavViewport ) { //, fb: FormBuilder ) {
@@ -42,7 +42,7 @@ export class LoginPage {
 })
 @Template({
   url: 'pages/signup.html',
-  directives: [View, FormDirectives, Button]
+  directives: [View, FormDirectives, Button, Input]
 })
 export class SignupPage {
   constructor( @Parent() viewport: NavViewport ) { //, fb: FormBuilder ) {
diff --git a/src/components/app/test/barkpark/pages/login.html b/src/components/app/test/barkpark/pages/login.html
index d342803abc..5bf47651d5 100644
--- a/src/components/app/test/barkpark/pages/login.html
+++ b/src/components/app/test/barkpark/pages/login.html
@@ -4,7 +4,7 @@
       <input control="email" type="email" placeholder="Your email">
     </ion-input>
     <ion-input>
-      <input control="password" type="email" placeholder="Your password">
+      <input control="password" type="password" placeholder="Your password">
     </ion-input>
     <button ion-button stable block type="submit">Log in</button>
     <div>
diff --git a/src/components/app/test/barkpark/pages/signup.html b/src/components/app/test/barkpark/pages/signup.html
index 54424264a2..7a00f296ad 100644
--- a/src/components/app/test/barkpark/pages/signup.html
+++ b/src/components/app/test/barkpark/pages/signup.html
@@ -1,17 +1,17 @@
 <ion-view nav-title="Signup" style="padding: 20px">
   <form (^submit)="doSignup($event)" [control-group]="signupForm">
     <ion-input>
-      <input control="name" type="email" placeholder="Your name">
+      <input control="name" type="text" placeholder="Your name">
     </ion-input>
     <ion-input>
       <input control="email" type="email" placeholder="Your email">
     </ion-input>
     <ion-input>
-      <input control="password" type="email" placeholder="Your password">
+      <input control="password" type="password" placeholder="Your password">
     </ion-input>
     <button ion-button stable block type="submit">Create account</button>
     <div>
-      <button ion-button primary block (click)="doLogin()">Login in</button>
+      <button ion-button primary block (click)="doLogin()">Log in</button>
     </div>
   </form>
 </ion-view>
diff --git a/src/components/form/input.scss b/src/components/form/input.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/form/input.js b/src/components/input/input.js
similarity index 100%
rename from src/components/form/input.js
rename to src/components/input/input.js
diff --git a/src/components/input/input.scss b/src/components/input/input.scss
new file mode 100644
index 0000000000..7d099993a0
--- /dev/null
+++ b/src/components/input/input.scss
@@ -0,0 +1,6 @@
+ion-input {
+  display: block;
+  input {
+    width: 100%;
+  }
+}
diff --git a/src/ionic.scss b/src/ionic.scss
index b2626eedfe..b0b2cf11d9 100644
--- a/src/ionic.scss
+++ b/src/ionic.scss
@@ -37,6 +37,7 @@
   "components/content/content",
   "components/item/item",
   "components/form/form",
+  "components/input/input",
   "components/layout/layout",
   "components/list/list",
   "components/modal/modal",