diff --git a/frontend/delta/js/Clipperz/PM/UI/Components.js b/frontend/delta/js/Clipperz/PM/UI/Components.js
index 5d49aa2..34a6588 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI');
 
 //	code snippet taken on March 23, 2015 from here: https://github.com/JedWatson/classnames/blob/master/index.js
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Button.js b/frontend/delta/js/Clipperz/PM/UI/Components/Button.js
index 054472f..3641fc2 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Button.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Button.js
@@ -21,6 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components');
 
 Clipperz.PM.UI.Components.ButtonClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/CommandToolbar.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/CommandToolbar.js
index 20f8f52..874c429 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/CommandToolbar.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/CommandToolbar.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.CommandToolbarClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js
index aa0d552..aa75b25 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.EditClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/EditToolbar.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/EditToolbar.js
index e400740..d9e0059 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/EditToolbar.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/EditToolbar.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.EditToolbarClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/FavIcon.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/FavIcon.js
index bd1b416..ac4c839 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/FavIcon.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/FavIcon.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/List.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/List.js
index c193c0f..d873fe3 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/List.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/List.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.ListClass = React.createClass({
@@ -79,7 +79,9 @@ Clipperz.PM.UI.Components.Cards.ListClass = React.createClass({
 		classes[this.props['style']] = true;
 
 		return	React.DOM.div({'key':'cardList', 'className':Clipperz.PM.UI.Components.classNames(classes)}, [
-					this.isFeatureEnabled('LIST_CARDS') ? React.DOM.ul({}, MochiKit.Base.map(this.renderItem, cards)) : null
+					React.DOM.div({'className':'cardListInnerWrapper'}, [
+						this.isFeatureEnabled('LIST_CARDS') ? React.DOM.ul({}, MochiKit.Base.map(this.renderItem, cards)) : null
+					])
 				]);
 	},
 	
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/PasswordGenerator.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/PasswordGenerator.js
index ec38b30..0e1e5d0 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/PasswordGenerator.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/PasswordGenerator.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.PasswordGeneratorClass = React.createClass({
@@ -38,16 +38,17 @@ Clipperz.PM.UI.Components.Cards.PasswordGeneratorClass = React.createClass({
 
 	getInitialState: function () {
 		return {
-			'length':	32,
-			'options':	'closed',
+			'length':		24,
+			'options':		'closed',
 			'chars_AZ':		true,
 			'chars_az':		true,
 			'chars_09':		true,
 			'chars_space':	false,
 			'chars_other':	true,
+
 			'charset':	'',
 			'password':	'',
-			'entropy': 0,
+			'entropy':	0,
 		};
 	},
 
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TagEditor.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TagEditor.js
index 220ffda..7746446 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TagEditor.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TagEditor.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.TagEditorClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TextArea.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TextArea.js
index 78bc33d..93f40a6 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TextArea.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/TextArea.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.TextAreaClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js
index 8abb7aa..25fe530 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Cards');
 
 Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
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 6f660c1..de8ea82 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js
@@ -60,6 +60,22 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
 	    this.setState(newState);
 	},
 
+	pollForChanges: function() {
+		if (this.props.mode == 'CREDENTIALS') {
+			var newState;
+
+			var usernameValue = this.refs['username'].getDOMNode().value;
+			var passphraseValue = this.refs['passphrase'].getDOMNode().value;
+
+			newState = {};
+
+			newState['username'] = (usernameValue) ? usernameValue : "";
+			newState['passphrase'] = (passphraseValue) ? passphraseValue : "";
+
+			this.setState(newState);
+		}
+	},
+
 	//=========================================================================
 
 	handleCredentialSubmit: function (event) {
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/MainPage.js b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/MainPage.js
index 6e929d0..b643830 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/MainPage.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/MainPage.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Pages');
 
 Clipperz.PM.UI.Components.Pages.MainPageClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Panels/MainPanel.js b/frontend/delta/js/Clipperz/PM/UI/Components/Panels/MainPanel.js
index d33a013..2188f02 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Panels/MainPanel.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Panels/MainPanel.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Panels');
 
 Clipperz.PM.UI.Components.Panels.MainPanelClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Panels/SelectionPanel.js b/frontend/delta/js/Clipperz/PM/UI/Components/Panels/SelectionPanel.js
index d9139dc..988d349 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Panels/SelectionPanel.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Panels/SelectionPanel.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components.Panels');
 
 Clipperz.PM.UI.Components.Panels.SelectionPanelClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js b/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js
index 13032cb..1f95787 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components');
 
 Clipperz.PM.UI.Components.SelectionsClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/TagIndexItem.js b/frontend/delta/js/Clipperz/PM/UI/Components/TagIndexItem.js
index 52a7004..1ba4f03 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/TagIndexItem.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/TagIndexItem.js
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-'use strict';
+"use strict";
 Clipperz.Base.module('Clipperz.PM.UI.Components');
 
 Clipperz.PM.UI.Components.TagIndexItemClass = React.createClass({
diff --git a/frontend/delta/js/Clipperz/PM/UI/MainController.js b/frontend/delta/js/Clipperz/PM/UI/MainController.js
index a50c393..e86c818 100644
--- a/frontend/delta/js/Clipperz/PM/UI/MainController.js
+++ b/frontend/delta/js/Clipperz/PM/UI/MainController.js
@@ -294,6 +294,15 @@ console.log("THE BROWSER IS OFFLINE");
 		loginFormPage.setProps({'mode':this.loginMode()});
 		this.moveInPage(this.currentPage(), 'loginPage');
 		MochiKit.Async.callLater(0.5, MochiKit.Base.method(loginFormPage, 'setInitialFocus'));
+		MochiKit.Async.callLater(0.5, MochiKit.Base.method(this, 'recursivelyPollLoginFormForChanges'));
+	},
+
+	recursivelyPollLoginFormForChanges: function () {
+		this.pages()['loginPage'].pollForChanges();
+
+		if (this.currentPage() == 'loginPage') {
+			MochiKit.Async.callLater(0.5, MochiKit.Base.method(this, 'recursivelyPollLoginFormForChanges'));
+		}
 	},
 
 	showRegistrationForm_handler: function () {