diff --git a/README.md b/README.md
index 8b140781..37a68608 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ OpenSupports v4.0
     - `sudo apt-get install -y nodejs`
 3. Install npm `sudo apt-get install npm`
 4. Install gulp `sudo npm install -g gulp`
-5. Go to repo `cd os4-react`
+5. Go to repo `cd os4-react/client`
 6. Install dependences `npm install`
 7. Rebuild node-sass `npm rebuild node-sass`
 8. Run `gulp dev`
diff --git a/client/src/app/Routes.js b/client/src/app/Routes.js
index 317b4081..389bf918 100644
--- a/client/src/app/Routes.js
+++ b/client/src/app/Routes.js
@@ -13,16 +13,16 @@ import MainSignUpPage from 'app/main/main-signup/main-signup-page';
 import MainRecoverPasswordPage from 'app/main/main-recover-password/main-recover-password-page';
 
 import DashboardLayout from 'app/main/dashboard/dashboard-layout';
-
 import DashboardListTicketsPage from 'app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page';
 import DashboardListArticlesPage from 'app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page';
-
 import DashboardCreateTicketPage from 'app/main/dashboard/dashboard-create-ticket/dashboard-create-ticket-page';
 import DashboardEditProfilePage from 'app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page';
-
 import DashboardArticlePage from 'app/main/dashboard/dashboard-article/dashboard-article-page';
 import DashboardTicketPage from 'app/main/dashboard/dashboard-ticket/dashboard-ticket-page';
 
+import AdminLoginPage from 'app/admin/admin-login-page';
+import AdminPanel from 'app/admin/panel/admin-panel';
+
 const history = syncHistoryWithStore(browserHistory, store);
 
 export default (
@@ -43,6 +43,12 @@ export default (
                     <Route path='ticket/:ticketNumber' component={DashboardTicketPage}/>
                 </Route>
             </Route>
+            <Route path='admin'>
+                <IndexRoute component={AdminLoginPage} />
+                <Route path='panel' component={MainLayout}>
+                    <IndexRoute component={AdminPanel} />
+                </Route>
+            </Route>
 
             <Route name='Demo' path='demo' component={DemoPage} />
         </Route>
diff --git a/client/src/app/admin/admin-login-page.js b/client/src/app/admin/admin-login-page.js
new file mode 100644
index 00000000..e4727f21
--- /dev/null
+++ b/client/src/app/admin/admin-login-page.js
@@ -0,0 +1,33 @@
+import React from 'react';
+
+import i18n from 'lib-app/i18n';
+import API from 'lib-app/api-call';
+
+import Form from 'core-components/form';
+import FormField from 'core-components/form-field';
+import SubmitButton from 'core-components/submit-button';
+
+class AdminLoginPage extends React.Component {
+    render(){
+        return (
+            <div className="admin-login-page">
+                <div className="admin-login-page__content">
+                    <div className="admin-login-page__image"><img width="100%" src="/images/logo.png" alt="OpenSupports Admin Panel"/></div>
+                    <div className="admin-login-page__login-form">
+                        <Form onSubmit={this.onSubmit.bind(this)}>
+                            <FormField name="email" label={i18n('EMAIL')} field="input" validation="EMAIL" fieldProps={{size:'large'}} required />
+                            <FormField name="password" label={i18n('PASSWORD')} field="input" validation="PASSWORD" fieldProps={{password:true, size:'large'}} required />
+                            <SubmitButton> {i18n('LOG_IN')} </SubmitButton>
+                        </Form>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+
+    onSubmit(formState) {
+        
+    }
+}
+
+export default AdminLoginPage;
\ No newline at end of file
diff --git a/client/src/app/admin/admin-login-page.scss b/client/src/app/admin/admin-login-page.scss
new file mode 100644
index 00000000..60a5a738
--- /dev/null
+++ b/client/src/app/admin/admin-login-page.scss
@@ -0,0 +1,24 @@
+@import '../../scss/vars';
+
+.admin-login-page {
+    display: flex;
+
+    &__content {
+        margin: 0 auto;
+        display: inline-block;
+        background-color: white;
+        padding: 40px;
+        border-radius: 4px;
+        text-align: center;
+    }
+
+    &__image {
+        width: 365px;
+        margin-bottom: 30px;
+    }
+
+    &__login-form {
+        margin: 0 auto;
+        display: inline-block;
+    }
+}
\ No newline at end of file
diff --git a/client/src/app/admin/panel/admin-panel.js b/client/src/app/admin/panel/admin-panel.js
new file mode 100644
index 00000000..b0bb5113
--- /dev/null
+++ b/client/src/app/admin/panel/admin-panel.js
@@ -0,0 +1,13 @@
+import React from 'react';
+
+class AdminPanel extends React.Component {
+    render(){
+        return (
+            <div>
+                Admin panel...
+            </div>
+        );
+    }
+}
+
+export default AdminPanel;
\ No newline at end of file
diff --git a/client/src/app/admin/panel/admin-panel.scss b/client/src/app/admin/panel/admin-panel.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js b/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js
index 10c85f55..4e32405f 100644
--- a/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js
+++ b/client/src/app/main/dashboard/dashboard-edit-profile/dashboard-edit-profile-page.js
@@ -33,8 +33,8 @@ class DashboardEditProfilePage extends React.Component {
                 </Form>
                 <div className="edit-profile-page__title">Edit password</div>
                 <Form loading={this.state.loadingPass} onSubmit={this.onSubmitEditPassword.bind(this)}>
-                    <FormField name="oldPassword" label="Old Password" field="input" validation="PASSWORD" fieldProps={{password:true ,size:'large'}} required/>
-                    <FormField name="password" label="New Password" field="input" validation="PASSWORD" fieldProps={{password:true ,size:'large'}} required/>
+                    <FormField name="oldPassword" label="Old Password" field="input" validation="PASSWORD" fieldProps={{password:true, size:'large'}} required/>
+                    <FormField name="password" label="New Password" field="input" validation="PASSWORD" fieldProps={{password:true, size:'large'}} required/>
                     <FormField name="repeatNewPassword" label="Repeat New Password" field="input" validation="REPEAT_PASSWORD" fieldProps={{password:true ,size:'large'}} required/>
                     <SubmitButton>CHANGE PASSWORD</SubmitButton>
                     {this.renderMessagePass()}
diff --git a/client/src/assets/images/logo.png b/client/src/assets/images/logo.png
new file mode 100644
index 00000000..241ba7e1
Binary files /dev/null and b/client/src/assets/images/logo.png differ
diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js
index 9523ca03..0eea85dc 100644
--- a/client/src/data/languages/en.js
+++ b/client/src/data/languages/en.js
@@ -4,6 +4,8 @@ export default {
     'ARTICLES': 'Articles',
     'ACCOUNT': 'Account',
     'SUBMIT': 'Submit',
+    'EMAIL': 'Email',
+    'PASSWORD': 'Password',
     'LOG_IN': 'Log in',
     'SIGN_UP': 'Sign up',
     'FORGOT_PASSWORD': 'Forgot your password?',
diff --git a/server/data/mail-templates/user-recovered-password-en.html b/server/data/mail-templates/user-recovered-password-en.html
index 31681985..d7c747fa 100644
--- a/server/data/mail-templates/user-recovered-password-en.html
+++ b/server/data/mail-templates/user-recovered-password-en.html
@@ -1,3 +1,3 @@
 <div>
-    Hi {{name}} , OpenSupports' team wanna inform you that you password has been chageed successfully.
+    Hi {{name}} , OpenSupports' team wanna inform you that you password has been changed successfully.
 </div>
\ No newline at end of file
diff --git a/server/data/mail-templates/user-recovered-password-es.html b/server/data/mail-templates/user-recovered-password-es.html
index 9858d06f..81e157c3 100644
--- a/server/data/mail-templates/user-recovered-password-es.html
+++ b/server/data/mail-templates/user-recovered-password-es.html
@@ -1,3 +1,3 @@
 <div>
-    Hola {{name}} , el equipo de OpenSupports te informa que tu contraseña ha sido cambiada
+    Hola {{name}} , el equipo de OpenSupports te informa que tu contraseña ha sido cambiada.
 </div>
\ No newline at end of file
diff --git a/server/libs/DataStoreList.php b/server/libs/DataStoreList.php
index d4fb8dc0..c14eed97 100644
--- a/server/libs/DataStoreList.php
+++ b/server/libs/DataStoreList.php
@@ -1,7 +1,7 @@
 <?php
 require_once 'models/DataStore.php';
 
-class DataStoreList implements IteratorAggregate{
+class DataStoreList implements IteratorAggregate {
     private $list = [];
     
     public static function getList($type, $beanList) {
diff --git a/server/models/DataStore.php b/server/models/DataStore.php
index c2006219..c8296b12 100644
--- a/server/models/DataStore.php
+++ b/server/models/DataStore.php
@@ -71,7 +71,6 @@ abstract class DataStore {
     }
 
     public function &__get($name) {
-        'hello';
         if (!array_key_exists($name, $this->properties) || !$this->properties[$name]) {
             $this->properties[$name] = $this->parseBeanProp($name);
         }