diff --git a/application/modules/default/views/scripts/authorization/login.phtml b/application/modules/default/views/scripts/authorization/login.phtml
index a9a78e29f..71f3995cc 100644
--- a/application/modules/default/views/scripts/authorization/login.phtml
+++ b/application/modules/default/views/scripts/authorization/login.phtml
@@ -1,153 +1,155 @@
 <?php
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
 $users = $this->newUsers($limit = 216,'created_at','DESC');
 $buildMemberUrl = new Default_View_Helper_BuildMemberUrl();
 $url_param_redirect = isset($this->redirect) ? 'redirect/'.$this->redirect : null;
 $this->headMeta()->setName('robots', 'noindex, nofollow');
 ?>
   <link href="/theme/flatui/css/bootstrap/social-buttons.css" rel="stylesheet" type="text/css">
   <style>
     .btn-github {
       border: 1px solid;
       border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
     }
   </style>
 	<!-- new code -->
     <main id="reg-page">
 
         <section class="wrapper" id="register-wrap">
             <div id="register" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 clearfix">
                 <div id="register-box" class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
 
                     <?= $this->render('authorization/partials/loginForm.phtml') ?>
 
                 </div>
                 <!-- END #register-box -->
               <div id="social-register" class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
                 <h3></h3>
 
                 <div id="social-login-elements">
+                  <?php /*
                   <div class="register-facebook">
                     <p class="small center light greylight">Login with</p>
                     <a  href="/login/github/<?=$url_param_redirect?>" class="btn btn-block btn-social btn-github" rel="nofollow">
                       <span class="fa fa-github"></span>
                       <span class="small">Github</span>
                     </a>
                   </div>
-
+                  */ ?>
+                          
                   <div class="bottom margin-top-15">
                     <a  href="/login/ocs/<?=$url_param_redirect?>" class="btn btn-block btn-social btn-github">
                         <span class="glyphicon glyphicon-log-in"></span>
                         <span class="small" style="padding-left:2px;">openDesktop ID</span>
                     </a>
                   </div>
 
                     <div class="bottom margin-top-15">
                     <div id="show-login-description" class="small light lightgrey">Join us?</div>
                     <div class="login2">
                       <a href="/register/" id="show-login-form" class="btn btn-native btn-min-width">
                         <i class="icon-white icon-lock"></i>
                         Register
                       </a>
                     </div>
                   </div>
                 </div>
 
               </div>
         </section>
 
         <section id="thumbs" >
 
 			<?php foreach ($users as $key => $user) { ?>
 
                 <div class="thumb">
                     <a href="<?php echo $buildMemberUrl->buildMemberUrl($user['member_id']); ?>" title="<?=$user['profile_image_url']?>">
                         <span ></span>
                         <img src="<?php echo $this->Image($user['profile_image_url'],array('width' => 110, 'height' => 110, 'crop' => 2)); ?>"/>
                         
                     </a>
                 </div>
 
             <?php } ?>
         
         
         </section>
 
     </main>
     <!-- /new code -->
 <script>
     var PartialJsonLogin = (function () {
         return {
             setup: function () {
                 $('body').on("submit", 'form.partialjson', function (event) {
                     event.preventDefault();
                     event.stopImmediatePropagation();
 
                     var target = $(this).attr("data-target");
                     var trigger = $(this).attr("data-trigger");
                     var loadState = $(this).attr('data-load-state');
 
                     $(target).find(loadState).prop('disabled', true);
                     $(target).find(loadState).find('i').removeClass('hidden');
 
                     jQuery.ajax({
                         data: $(this).serialize(),
                         url: this.action,
                         type: this.method,
                         dataType: "json",
                         error: function () {
                             $(target).empty().html("<span class='error'>Service is temporarily unavailable. Our engineers are working quickly to resolve this issue. <br/>Find out why you may have encountered this error.</span>");
                             $(target).find(loadState).prop('disabled', false);
                             $(target).find(loadState).find('i').addClass('hidden');
                         },
                         success: function (data, textStatus) {
                             $(target).find(loadState).prop('disabled', false);
                             $(target).find(loadState).find('i').addClass('hidden');
 
                             if (data.redirect) {
                                 // data.redirect contains the string URL to redirect to
                                 window.location.href = data.redirect;
                                 return;
                             }
                             if (target) {
                                 // data.message contains the HTML for the replacement form
                                 $(target).empty().html(data.message);
                             }
                             if (trigger) {
                                 $(target).find(trigger).trigger('click');
                             }
                         }
                     });
 
                     return false;
                 });
             }
         }
     })();
 </script>
 
 <?php $this->inlineScript()->appendScript(
     '    $(document).ready(function(){
             PartialJsonLogin.setup();
         });
     ');
diff --git a/application/modules/default/views/scripts/authorization/register.phtml b/application/modules/default/views/scripts/authorization/register.phtml
index b6f31dd30..5e860f526 100644
--- a/application/modules/default/views/scripts/authorization/register.phtml
+++ b/application/modules/default/views/scripts/authorization/register.phtml
@@ -1,197 +1,198 @@
 <?php
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
 $helperNewUsers = new Default_View_Helper_NewUsers();
 $users = $helperNewUsers->newUsers($limit = 216,'created_at','DESC');
 $buildMemberUrl = new Default_View_Helper_BuildMemberUrl();
 $helperImage = new Default_View_Helper_Image();
 $this->headMeta()->setName('robots', 'noindex, nofollow');
 ?>
 	<!-- new code -->
     <main id="reg-page">
 
         <section class="wrapper" id="register-wrap">
             <div id="register" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 clearfix">
                 <div id="register-box" class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
 
                     <?= $this->render('authorization/partials/registerForm.phtml') ?>
 
                 </div>
                 <!-- END #register-box -->
                 <div id="social-register" class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
                     <h3></h3>
 
                     <div id="social-login-elements">
+                        <?php /*
                         <div class="register-facebook">
                             <p class="small center light greylight">Register with</p>
                             <a  href="/login/github/" class="btn btn-block btn-social btn-github" rel="nofollow">
                                 <span class="fa fa-github"></span>
                                 <span class="small">Github</span>
                             </a>
                         </div>
-
+                        */ ?>
                         <div class="bottom margin-top-15">
                             <div id="show-login-description" class="small light lightgrey">Already have an account?</div>
                             <div class="login2">
                                 <a href="/login/" id="show-login-form" class="btn btn-native btn-min-width">
                                     <i class="icon-white icon-lock"></i>
                                     Login
                                 </a>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </section>
 
         <section id="thumbs">
 
         	<?php foreach ($users as $key => $user) { ?>
 
                 <div class="thumb">
                     <a href="<?php echo $buildMemberUrl->buildMemberUrl($user['member_id']); ?>">
                         <span></span>
                         <img src="<?php echo $helperImage->Image($user['profile_image_url'],array('width' => 110, 'height' => 110, 'crop' => 2)); ?>"/>
                     </a>
                 </div>
 
             <?php } ?>
         
 
         </section>
 
     </main>
     <!-- /new code -->
 
 <script>
 $('document').ready(function(){
 
     var ValidateAjax = {
         isClean: {},
         initialize: function (formid, endpoint) {
             end_url = endpoint;
             form_id = '#'+formid;
 
             $(form_id +' input[id=username],input[id=mail]').
             blur(function () {
                 var formElementID = $(this).attr('id');
                 var formElementValue = $(this).val();
                 ValidateAjax.doValidate(formElementID, formElementValue);
                 return false;
             });
             $(form_id).on('submit', function(e){
                 var target = $(this).attr("data-target");
                 var loadState = $(this).attr('data-load-state');
 
                 $(target).find(loadState).prop('disabled', true);
                 $(target).find(loadState).find('i').removeClass('hidden');
 
                 var validateValues = ValidateAjax.isClean;
                 for (var k in validateValues){
                     if (validateValues.hasOwnProperty(k)) {
                         if (!validateValues[k]) {
                             e.preventDefault();
                             return false;
                         }
                     }
                 }
                 return true;
             });
         },
 
         doValidate: function (id, value) {
             $.fn.capitalize = function () {
                 $.each(this, function () {
                     var caps = this.value;
                     caps = caps.charAt(0).toUpperCase() + caps.slice(1);
                     this.value = caps;
                 });
                 return this;
             };
             
             var url = end_url;
             var data = {'name' : id, 'value': value};
             $.post(url, data, function (response) {
                 $('#'+id).parent().find('.form-control-feedback').remove();
                 $('#'+id).parent().removeClass('has-error');
                 
                 if (!response['status']) {
                     ValidateAjax.isClean[id] = false;
                     $('#login').attr("disabled","disabled");
                     
                     $('#'+id).parent().addClass('has-error');
                     if (response[id]) {
                         $('#'+id).parent().append('<i class="glyphicon glyphicon-remove form-control-feedback"></i>');
                         $('#'+id).parent().find('.errors').remove();
                         
                         $msgArray = response[id];
                         $msgString = "";
                         $msgString += '<ul class="errors" style="text-align: left;">';
                         if(id == 'mail') {
                             $msgString += '<li class="errors">Email is invalid or already taken</li>';
                         } else {
                             $.each($msgArray, function( key, value ) {
                                 if(key == 'regexNotMatch') {
                                     $msgString += '<li class="errors">Username may only contain lower case alphanumeric characters or single hyphens, and cannot begin or end with a hyphen</li>';
                                 } else {
                                     $msgString += '<li class="errors">' + value + '</li>';
                                 }
                             });
                             
                         }
                         $msgString += '</ul>';
                             $('#'+id).parent().append($msgString);
                         if($msgString == '<ul class="errors" style="text-align: left;"></ul>') {
                             $('#'+id).parent().append('<ul class="errors" style="text-align: left;"><li class="errors">This '+id+' is already taken</li></ul>');
                         }
                     }
                 } else {
                     ValidateAjax.isClean[id] = true;
                     $('#login').removeAttr("disabled");
                     $('#'+id).parent().addClass('has-success');
                     $('#'+id).parent().append('<i class="glyphicon glyphicon-ok form-control-feedback"></i>');
                     $('#'+id).parent().find('.errors').remove();
                     $('#'+id).parent().append('<ul class="errors" style="visibility: hidden;"><li></li></ul>');
                 }
             },'json');
 
         },
         getHTML: function (errArray) {
             var o = '<ul class="errors">';
             $.each(errArray,function(key,value){
                 o += '<li>'+ value+'</li>';
             });
             o+='</ul>';
 
             return o;
         }
     };
 
     ValidateAjax.initialize('<?= $this->formRegister->getAttrib('id') ?>', '/register/validate');
 });
 </script>
 
 <?php $this->inlineScript()->appendScript(
     '    $(document).ready(function(){
             // PartialJson.setup();
         });
     ');
diff --git a/library/Local/Auth/Adapter/Ocs.php b/library/Local/Auth/Adapter/Ocs.php
index 98fd23f99..dd4e9a3f8 100644
--- a/library/Local/Auth/Adapter/Ocs.php
+++ b/library/Local/Auth/Adapter/Ocs.php
@@ -1,267 +1,284 @@
 <?php
 
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 class Local_Auth_Adapter_Ocs implements Local_Auth_Adapter_Interface
 {
 
     const MD5 = 'enc01';
     const SHA = 'enc02';
     const PASSWORDSALT = 'ghdfklsdfgjkldfghdklgioerjgiogkldfgndfohgfhhgfhgfhgfhgfhfghfgnndf';
 
     protected $_db;
     protected $_tableName;
     protected $_identity;
     protected $_credential;
     protected $_encryption;
     protected $_resultRow;
 
     /**
      * __construct() - Sets configuration options
      *
      * @param Zend_Db_Adapter_Abstract $dbAdapter If null, default database adapter assumed
      * @param string                   $tableName
      *
      * @throws Zend_Auth_Adapter_Exception
      */
     public function __construct(Zend_Db_Adapter_Abstract $dbAdapter = null, $tableName = null)
     {
         $this->_db = $dbAdapter;
         if (empty($this->_db)) {
             $this->_db = Zend_Db_Table_Abstract::getDefaultAdapter();
             if (empty($this->_db)) {
                 throw new Zend_Auth_Adapter_Exception('No database adapter present');
             }
         }
 
         $this->_tableName = $tableName;
     }
 
     public static function getEncryptedPassword($password, $passwordType)
     {
         return $passwordType == Default_Model_DbTable_Member::PASSWORD_TYPE_HIVE ? sha1((self::PASSWORDSALT . $password . self::PASSWORDSALT))
             : md5($password);
     }
 
     /**
      * Performs an authentication attempt
      *
      * @return Zend_Auth_Result
      * @throws Zend_Exception
      */
     public function authenticate()
     {
         $validator = new Zend_Validate_EmailAddress();
         if ($validator->isValid($this->_identity)) {
             $resultSet = $this->fetchUserByEmail();
         } else {
             $resultSet = $this->fetchUserByUsername();
         }
 
         if (count($resultSet) == 0) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND, $this->_identity,
                 array('A record with the supplied identity could not be found.'));
         }
 
         if (count($resultSet) > 1) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS, $this->_identity,
                 array('More than one record matches the supplied identity.'));
         }
 
         if (empty($resultSet[0]['email_checked'])) {
             return $this->createAuthResult(Local_Auth_Result::MAIL_ADDRESS_NOT_VALIDATED, $resultSet[0]['member_id'],
                 array('Mail address not validated.'));
         }
 
         if ($resultSet[0]['is_active'] == 0) {
             return $this->createAuthResult(Local_Auth_Result::ACCOUNT_INACTIVE, $this->_identity, array('User account is inactive.'));
         }
 
         $this->_resultRow = array_shift($resultSet);
 
         return $this->createAuthResult(Zend_Auth_Result::SUCCESS, $this->_identity, array('Authentication successful.'));
     }
 
     /**
      * @return array
      * @throws Zend_Exception
      */
     private function fetchUserByEmail()
     {
         $sql = "
             SELECT `m`.*, `member_email`.`email_verification_value`, `member_email`.`email_checked` 
             FROM {$this->_tableName} AS m
             JOIN member_email ON m.member_id = member_email.email_member_id AND member_email.email_primary = 1
             WHERE  
             m.is_active = :active AND
             m.is_deleted = :deleted AND 
             m.login_method = :login AND 
             m.mail = :mail AND 
             m.`password` = :pwd";
 
         $this->_db->getProfiler()->setEnabled(true);
         $resultSet = $this->_db->fetchAll($sql, array(
             'active'  => Default_Model_DbTable_Member::MEMBER_ACTIVE,
             'deleted' => Default_Model_DbTable_Member::MEMBER_NOT_DELETED,
             'login'   => Default_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
             'mail'    => $this->_identity,
             'pwd'     => $this->_credential
         ));
-        Zend_Registry::get('logger')->debug(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()
+        
+        $sql = str_replace(':active', Default_Model_DbTable_Member::MEMBER_ACTIVE, $sql);
+        $sql = str_replace(':deleted', Default_Model_DbTable_Member::MEMBER_NOT_DELETED, $sql);
+        $sql = str_replace(':login',"'". Default_Model_DbTable_Member::MEMBER_LOGIN_LOCAL . "'", $sql);
+        $sql = str_replace(':mail', "'". $this->_identity . "'", $sql);
+        $sql = str_replace(':pwd', "'". $this->_credential . "'", $sql);
+        
+        
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' - SQL: ' . $sql . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()
                                                                                              ->getElapsedSecs())
         ;
         $this->_db->getProfiler()->setEnabled(false);
 
         return $resultSet;
     }
 
     /**
+     * Fetches a user by username, username ist not case sensitve
+     * 
      * @return array
      * @throws Zend_Exception
      */
     private function fetchUserByUsername()
     {
         $sql = "
             SELECT `m`.*, `member_email`.`email_verification_value`, `member_email`.`email_checked` 
             FROM `member` AS m
             JOIN `member_email` ON m.member_id = member_email.email_member_id AND member_email.email_primary = 1
             WHERE  
             m.`is_active` = :active AND 
             m.`is_deleted` = :deleted AND 
             m.`login_method` = :login AND 
-            m.`username` = :username AND 
+            LOWER(m.`username`) = LOWER(:username) AND 
             m.`password` = :pwd";
 
         $this->_db->getProfiler()->setEnabled(true);
         $resultSet = $this->_db->fetchAll($sql, array(
             'active'   => Default_Model_DbTable_Member::MEMBER_ACTIVE,
             'deleted'  => Default_Model_DbTable_Member::MEMBER_NOT_DELETED,
             'login'    => Default_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
             'username' => $this->_identity,
             'pwd'      => $this->_credential
         ));
-        Zend_Registry::get('logger')->debug(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()
+        
+        $sql = str_replace(':active', Default_Model_DbTable_Member::MEMBER_ACTIVE, $sql);
+        $sql = str_replace(':deleted', Default_Model_DbTable_Member::MEMBER_NOT_DELETED, $sql);
+        $sql = str_replace(':login',"'". Default_Model_DbTable_Member::MEMBER_LOGIN_LOCAL . "'", $sql);
+        $sql = str_replace(':username', "'". $this->_identity . "'", $sql);
+        $sql = str_replace(':pwd', "'". $this->_credential . "'", $sql);
+        
+        Zend_Registry::get('logger')->debug(__METHOD__. ' - SQL: ' . $sql . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()
                                                                                              ->getElapsedSecs())
         ;
         $this->_db->getProfiler()->setEnabled(false);
 
         return $resultSet;
     }
 
     protected function createAuthResult($code, $identity, $messages)
     {
         return new Local_Auth_Result($code, $identity, $messages);
     }
 
     /**
      * @param string $identity
      *
      * @return Local_Auth_Adapter_Ocs
      * @throws Zend_Exception
      */
     public function setIdentity($identity)
     {
         $this->_identity = $identity;
 
         return $this;
     }
 
     /**
      * @param string $credential
      *
      * @return Local_Auth_Adapter_Ocs
      * @throws Zend_Exception
      */
     public function setCredential($credential)
     {
         switch ($this->_encryption) {
             case self::MD5 :
                 $this->_credential = md5($credential);
                 break;
             case self::SHA :
                 $this->_credential = sha1((self::PASSWORDSALT . $credential . self::PASSWORDSALT));
                 break;
             default:
                 throw new Zend_Exception('There is no default case for credential encryption.');
         }
 
         return $this;
     }
 
     /**
      * @param mixed $encryption
      *
      * @return Local_Auth_Adapter_Ocs
      */
     public function setEncryption($encryption)
     {
         $this->_encryption = $encryption;
 
         return $this;
     }
 
     /**
      * getResultRowObject() - Returns the result row as a stdClass object
      *
      * @param  string|array $returnColumns
      * @param  string|array $omitColumns
      *
      * @return stdClass|boolean
      */
     public function getResultRowObject($returnColumns = null, $omitColumns = null)
     {
         if (!$this->_resultRow) {
             return false;
         }
 
         $returnObject = new stdClass();
 
         if (null !== $returnColumns) {
 
             $availableColumns = array_keys($this->_resultRow);
             foreach ((array)$returnColumns as $returnColumn) {
                 if (in_array($returnColumn, $availableColumns)) {
                     $returnObject->{$returnColumn} = $this->_resultRow[$returnColumn];
                 }
             }
 
             return $returnObject;
         } else if (null !== $omitColumns) {
 
             $omitColumns = (array)$omitColumns;
             foreach ($this->_resultRow as $resultColumn => $resultValue) {
                 if (!in_array($resultColumn, $omitColumns)) {
                     $returnObject->{$resultColumn} = $resultValue;
                 }
             }
 
             return $returnObject;
         } else {
 
             foreach ($this->_resultRow as $resultColumn => $resultValue) {
                 $returnObject->{$resultColumn} = $resultValue;
             }
 
             return $returnObject;
         }
     }
 
 }
\ No newline at end of file