diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index c55419d8..49e55960 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -4,11 +4,11 @@
 <table>
 <tr>
     <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
-    <td align="left"><p><%= text_field_tag 'username', nil, :size => 40 %></p></td>
+    <td align="left"><p><%= text_field_tag 'username', nil %></p></td>
 </tr>
 <tr>
     <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
-    <td align="left"><%= password_field_tag 'password', nil, :size => 40 %></td>
+    <td align="left"><%= password_field_tag 'password', nil %></td>
 </tr>
 <% if Setting.openid? %>
 <tr>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 813c8f19..47c187a4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -69,6 +69,7 @@ html>body #content { min-height: 600px; }
 #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
 #login-form table td {padding: 6px;}
 #login-form label {font-weight: bold;}
+#login-form input#username, #login-form input#password { width: 300px; }
 
 input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }