diff --git a/front-ui/app/components/account/login.js b/front-ui/app/components/account/login.js
index b1d157f..d3335a4 100644
--- a/front-ui/app/components/account/login.js
+++ b/front-ui/app/components/account/login.js
@@ -96,7 +96,9 @@ var Login = React.createClass({
 
                 {this.getValidationMessages('password').map(this.renderErrorMessage)}
                 </div>
-                <button type="button" onClick={this.doLogin} className="btn btn-default">Prijava</button>
+                <div className="form-group">
+                <button type="button" onClick={this.doLogin} className="btn btn-success">Prijava</button>
+                </div>
                 </form>
                 </div>
 
diff --git a/front-ui/app/components/account/register.js b/front-ui/app/components/account/register.js
index c95e08a..adc364e 100644
--- a/front-ui/app/components/account/register.js
+++ b/front-ui/app/components/account/register.js
@@ -271,7 +271,7 @@ var Register = React.createClass({
   var classes = cx({
     'hide': regSuccess 
   });
-  if (this.state.loginState.loggedIn) {
+  if (!this.state.registration.performed && this.state.loginState.loggedIn) {
       return (<div>Vi ste već registrovani. Uživajte u kupovini.</div>)
   }
     return (<div>