diff --git a/client/pages/connectpage.js b/client/pages/connectpage.js
index 1675543f..b2843ec2 100644
--- a/client/pages/connectpage.js
+++ b/client/pages/connectpage.js
@@ -4,7 +4,7 @@ import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 import './connectpage.scss';
 import { Session } from '../model/';
 import { Container, NgIf, NgShow, Loader, Notification, ErrorPage } from '../components/';
-import { ForkMe, RememberMe, Credentials, Form } from './connectpage/';
+import { ForkMe, PoweredByFilestash, RememberMe, Credentials, Form } from './connectpage/';
 import { cache, notify, urlParams } from '../helpers/';
 
 import { Alert } from '../components/';
@@ -113,6 +113,7 @@ export class ConnectPage extends React.Component {
                           onSubmit={this.onFormSubmit.bind(this)} />
                   </ReactCSSTransitionGroup>
                   <ReactCSSTransitionGroup transitionName="remember" transitionLeave={false} transitionEnter={false} transitionAppear={true} transitionAppearTimeout={5000}>
+                    <PoweredByFilestash />
                     <RememberMe state={this.state.remember_me} onChange={this.setRemember.bind(this)}/>
                   </ReactCSSTransitionGroup>
                 </NgShow>
diff --git a/client/pages/connectpage/forkme.js b/client/pages/connectpage/forkme.js
index c9319564..74acc1c6 100644
--- a/client/pages/connectpage/forkme.js
+++ b/client/pages/connectpage/forkme.js
@@ -14,3 +14,12 @@ export const ForkMe = (props) => {
         </div>
     );
 };
+
+export const PoweredByFilestash = () => {
+    if(!window.CONFIG["fork_button"]) return null;
+    return (
+        <div className="component_poweredbyfilestash">
+          Powered by <strong><a href="https://www.filestash.app">Filestash</a></strong>
+        </div>
+    );
+};
diff --git a/client/pages/connectpage/forkme.scss b/client/pages/connectpage/forkme.scss
index a94fe598..5980e68d 100644
--- a/client/pages/connectpage/forkme.scss
+++ b/client/pages/connectpage/forkme.scss
@@ -20,3 +20,14 @@
         right: 0;
     }
 }
+
+.component_poweredbyfilestash{
+    display: inline-block;
+    color: rgba(0, 0, 0, 0.4);
+    font-size: 0.9em;
+    line-height: 20px;
+    strong{
+        font-weight: normal;
+        a{ text-decoration: underline; }
+    }
+}
diff --git a/client/pages/connectpage/form.scss b/client/pages/connectpage/form.scss
index 394dfce1..08cd24f6 100644
--- a/client/pages/connectpage/form.scss
+++ b/client/pages/connectpage/form.scss
@@ -1,4 +1,5 @@
 .component_page_connection_form{
+    margin-bottom: 7px;
     border-radius: 3px;
     box-shadow: 1px 1px 2px rgba(0,0,0,0.2);
     div.buttons{
diff --git a/client/pages/connectpage/index.js b/client/pages/connectpage/index.js
index 52d5a32e..7de56d8e 100644
--- a/client/pages/connectpage/index.js
+++ b/client/pages/connectpage/index.js
@@ -1,4 +1,4 @@
-export { ForkMe } from './forkme';
+export { ForkMe, PoweredByFilestash } from './forkme';
 export { RememberMe } from './rememberme';
 export { Form } from './form';
 export { Credentials } from './credentials';
diff --git a/client/pages/connectpage/rememberme.scss b/client/pages/connectpage/rememberme.scss
index 973417f4..c8f6aef2 100644
--- a/client/pages/connectpage/rememberme.scss
+++ b/client/pages/connectpage/rememberme.scss
@@ -3,6 +3,8 @@
     font-style: italic;
     font-size: 0.9em;
     display: inline-block;
-    width: 100%;
     text-align: right;
+    float: right;
+    line-height: 20px;
+    input[type="checkbox"]{ margin-right: -2px; margin-top: 2px; margin-left: 0; }
 }