diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js
index 472fb22..2be0466 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js
@@ -93,9 +93,8 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
 				!this.props['disabled'];
 	},
 
-
 	loginForm: function () {
-		return	React.DOM.form({'key':'form', 'className':'loginForm credentials', 'onChange':this.handleChange, 'onSubmit':this.handleCredentialSubmit}, [
+		return	React.DOM.form({'key':'form', 'className':'loginForm credentials', 'autoComplete':'off', 'onChange':this.handleChange, 'onSubmit':this.handleCredentialSubmit}, [
 					React.DOM.div({'key':'fields'},[
 						React.DOM.label({'key':'username-label', 'htmlFor' :'name'}, "username"),
 						React.DOM.input({'key':'username', 'type':'text', 'name':'name', 'ref':'username', 'placeholder':"username", 'autoCapitalize':'none'}),
@@ -119,7 +118,7 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
 	},
 
 	pinForm: function () {
-		return	React.DOM.form({'className':'pinForm pin', 'onChange':this.handleChange, 'onSubmit':this.handlePINSubmit}, [
+		return	React.DOM.form({'className':'pinForm pin', 'autoComplete':'off', 'onChange':this.handleChange, 'onSubmit':this.handlePINSubmit}, [
 					React.DOM.div({'key':'pinFormDiv'},[
 						React.DOM.label({'for':'pin'}, "pin"),
 						React.DOM.input({'type':'text', 'name':'pin', 'ref':'pin', placeholder:"PIN", 'key':'pin', 'autocapitalize':'none'})
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
index 4d1704c..cb65a55 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
@@ -218,7 +218,7 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
 		return	React.DOM.div({'className':'registrationForm'},[
 					React.DOM.header({'key':'header'}, 'clipperz'),
 					React.DOM.div({'key':'body', 'className':'form'}, [
-						React.DOM.form({'key':'registrationForm', 'onChange': this.handleChange}, [
+						React.DOM.form({'key':'registrationForm', 'autoComplete':'off', 'onChange': this.handleChange}, [
 							React.DOM.div({'key':'steps', 'className':'steps'}, MochiKit.Base.map(this.renderStep, this.props['steps']))
 						])
 					]),