diff --git a/views/formlogin.py b/views/formlogin.py
index a766f6c..a5d9c76 100644
--- a/views/formlogin.py
+++ b/views/formlogin.py
@@ -5,13 +5,13 @@
 
 class FormLogin(Form):
 
-    def __init__(self, master):
+    def __init__(self, master):	
         Form.__init__(self, master)
         self._initialize(master)
         self._initialize_view(master)
 
     def _initialize(self, master):
-        self.username = StringVar()
+	self.username = StringVar()
         self.password = StringVar()
         self.friend = StringVar()
         self.message = StringVar()
@@ -19,6 +19,7 @@ def _initialize(self, master):
     def _initialize_view(self, master):
         self.master.title("fbChat")
         self.master.geometry("250x100")
+        self.master.bind("<Return>", self._on_buttonlogin_clicked)
         fbphoto = PhotoImage(file='img/FB-f-Logo_blue_58.gif')
         self.fblogo = Label(master, image=fbphoto)
         self.fblogo.image = fbphoto
@@ -31,7 +32,6 @@ def _initialize_view(self, master):
         self.buttonlogin = Button(master,
                                   text="Login",
                                   command=self._on_buttonlogin_clicked)
-
         self.fblogo.grid(row=0, column=0, rowspan=2, pady=5)
         self.labelid.grid(row=0, column=1)
         self.labelpass.grid(row=1, column=1)
@@ -39,7 +39,7 @@ def _initialize_view(self, master):
         self.entrypass.grid(row=1, column=2)
         self.buttonlogin.grid(row=2, column=1, columnspan=2)
 
-    def _on_buttonlogin_clicked(self):
+    def _on_buttonlogin_clicked(self, event=None):
         username = self.username.get()
         password = self.password.get()
         try:
diff --git a/views/formloginfailure.py b/views/formloginfailure.py
index cf74a72..adbd368 100644
--- a/views/formloginfailure.py
+++ b/views/formloginfailure.py
@@ -9,11 +9,12 @@ def __init__(self, master):
         self._initialize(master)
         self._initialize_view(master)
 
-    def _initialize(self, master):
-        pass
+    def _initialize(self, master): 
+	pass
 
     def _initialize_view(self, master):
         self.master.title("Login Error")
+        self.master.bind("<Return>", self._on_loginagainbutton_clicked)
         self.err_text_widget = Text(master, bg='#3b5998', fg='#ffffff', height=5, width=40, font=("TkDefaultFont", "12"))
         self.err_text_widget.insert(INSERT, "Invalid loginID/Password combination!\nPlease try again!")
         self.err_text_widget.pack()
@@ -22,7 +23,7 @@ def _initialize_view(self, master):
                                          text="Login Again",
                                          command=self._on_loginagainbutton_clicked)
         self.loginagainbutton.pack()
-    def _on_loginagainbutton_clicked(self):
+    def _on_loginagainbutton_clicked(self, event=None):
         self.close()
         from formlogin import FormLogin
 	FormLogin(Tk())