diff --git a/Scrummer/Code/Pages/FrmLogin.cs b/Scrummer/Code/Pages/FrmLogin.cs
index fe7cc25..273af22 100644
--- a/Scrummer/Code/Pages/FrmLogin.cs
+++ b/Scrummer/Code/Pages/FrmLogin.cs
@@ -57,13 +57,21 @@ namespace Scrummer.Code.Pages
             Controls.Add(lblTitle);
 
             Controls.Add(FormUtils.CreateField("Name/Mail", _txtNameEmail));
+            _txtNameEmail.PlaceHolder = "Name/Mail";
+
             Controls.Add(FormUtils.CreateField("Password", _txtPassword));
+            _txtPassword.PlaceHolder = "Password";
 
             Controls.Add(FormUtils.CreateField(String.Empty, _btnLogin));
             _btnLogin.Text = "Login";
             _btnLogin.Click += btnLogin_Click;
 
             Controls.Add(FormUtils.CreateField(String.Empty, new HyperLink { Text = "Register user", NavigateUrl = "FrmRegister" }));
+
+            _txtNameEmail.Attributes.Add("onkeydown", String.Format(
+                "if(event.keyCode==13){{document.getElementById('{0}').focus(); return false;}}", _txtPassword.ClientID));
+            _txtPassword.Attributes.Add("onkeydown", String.Format(
+                "if(event.keyCode==13){{document.getElementById('{0}').focus(); return false;}}", _btnLogin.ClientID));
         }
 
         #endregion
diff --git a/Scrummer/Code/Pages/FrmRegister.cs b/Scrummer/Code/Pages/FrmRegister.cs
index a0398c9..166da7c 100644
--- a/Scrummer/Code/Pages/FrmRegister.cs
+++ b/Scrummer/Code/Pages/FrmRegister.cs
@@ -70,7 +70,6 @@ namespace Scrummer.Code.Pages
 
         #endregion
 
-
         #region Private methods
 
         private void InitializeComponents()
@@ -104,6 +103,15 @@ namespace Scrummer.Code.Pages
             pnlButtons.Controls.Add(_btnExit);
             _pnlRegister.Controls.Add(FormUtils.CreateField(String.Empty, pnlButtons));
 
+            _txtName.Attributes.Add("onkeydown", String.Format(
+                "if(event.keyCode==13){{document.getElementById('{0}').focus(); return false;}}", _txtEmail.ClientID));
+            _txtEmail.Attributes.Add("onkeydown", String.Format(
+                "if(event.keyCode==13){{document.getElementById('{0}').focus(); return false;}}", _txtPassword1.ClientID));
+            _txtPassword1.Attributes.Add("onkeydown", String.Format(
+                "if(event.keyCode==13){{document.getElementById('{0}').focus(); return false;}}", _txtPassword2.ClientID));
+            _txtPassword2.Attributes.Add("onkeydown", String.Format(
+                "if(event.keyCode==13){{document.getElementById('{0}').focus(); return false;}}", _btnRegister.ClientID));
+
 
             Controls.Add(_pnlSuccess);
             _pnlSuccess.Visible = false;