diff --git a/app/gabsocial/features/auth_login/index.js b/app/gabsocial/features/auth_login/index.js
index 6a846b2ce..705c42bc6 100644
--- a/app/gabsocial/features/auth_login/index.js
+++ b/app/gabsocial/features/auth_login/index.js
@@ -2,15 +2,11 @@ import React from 'react';
 import { connect } from 'react-redux'
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { createAuthApp, logIn } from 'gabsocial/actions/auth';
-import { Redirect } from 'react-router-dom';
 import { fetchMe } from 'gabsocial/actions/me';
+import { Link } from 'react-router-dom';
 
-const mapStateToProps = (state, props) => ({
-  me: state.get('me'),
-});
-
+export default @connect()
 class LoginForm extends ImmutablePureComponent {
-
   constructor(props) {
     super(props);
     this.state = {isLoading: false};
@@ -40,19 +36,23 @@ class LoginForm extends ImmutablePureComponent {
   }
 
   render() {
-    const { me } = this.props;
-    if (me) return <Redirect to='/' />;
-
     return (
-      <form onSubmit={this.handleSubmit}>
-        <fieldset disabled={this.state.isLoading}>
-          <input name='username' placeholder='me@example.com' />
-          <input name='password' type='password' placeholder='Password' />
-          <input type='submit' value='Login' />
+      <form className='simple_form new_user' onSubmit={this.handleSubmit}>
+        <fieldset className='fields-group' disabled={this.state.isLoading}>
+          <div className='input email optional user_email'>
+            <input aria-label='Username' className='string email optional' placeholder='Username' type='text' name='username' />
+          </div>
+          <div className='input password optional user_password'>
+            <input aria-label='Password' className='password optional' placeholder='Password' type='password' name='password' />
+          </div>
+          <p className='hint subtle-hint'>
+            <Link to='/auth/password/new'>Trouble logging in?</Link>
+          </p>
         </fieldset>
+        <div className='actions'>
+          <button name='button' type='submit' className='btn button button-primary'>Log in</button>
+        </div>
       </form>
     )
   }
 }
-
-export default connect(mapStateToProps)(LoginForm);
diff --git a/app/gabsocial/features/landing_page/index.js b/app/gabsocial/features/landing_page/index.js
index 3756b36ae..acbaf00b5 100644
--- a/app/gabsocial/features/landing_page/index.js
+++ b/app/gabsocial/features/landing_page/index.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux'
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { Link } from 'react-router-dom';
+import LoginForm from 'gabsocial/features/auth_login';
 
 const mapStateToProps = (state, props) => ({
   instance: state.get('instance'),
@@ -37,22 +38,7 @@ class LandingPage extends ImmutablePureComponent {
             <div className='nav-center'></div>
             <div className='nav-right'>
               <div className='hidden-sm'>
-                <form className='simple_form new_user' id='new_user' noValidate='novalidate' action='/auth/sign_in' acceptCharset='UTF-8' method='post'>
-                  <div className='fields-group'>
-                    <div className='input email optional user_email'>
-                      <input aria-label='E-mail address' className='string email optional' placeholder='E-mail address' type='email' name='user[email]' id='user_email' />
-                    </div>
-                    <div className='input password optional user_password'>
-                      <input aria-label='Password' className='password optional' placeholder='Password' type='password' name='user[password]' id='user_password' />
-                    </div>
-                    <p className='hint subtle-hint'>
-                      <Link to='/auth/password/new'>Trouble logging in?</Link>
-                    </p>
-                  </div>
-                  <div className='actions'>
-                    <button name='button' type='submit' className='btn button button-primary'>Log in</button>
-                  </div>
-                </form>
+                <LoginForm />
               </div>
               <div className='visible-sm'>
                 <Link className='webapp-btn nav-link nav-button' to='/auth/sign_in'>Log in</Link>
diff --git a/app/styles/gabsocial/forms.scss b/app/styles/gabsocial/forms.scss
index 323da61b2..597e3e391 100644
--- a/app/styles/gabsocial/forms.scss
+++ b/app/styles/gabsocial/forms.scss
@@ -294,6 +294,17 @@ code {
     }
   }
 
+  fieldset[disabled] {
+    input[type=text],
+    input[type=number],
+    input[type=email],
+    input[type=password],
+    textarea {
+      color: rgba($primary-text-color, 0.5);
+      border-color: rgba($primary-text-color, 0.5);
+    }
+  }
+
   input[type=text],
   input[type=number],
   input[type=email],