diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index f1517f8b92..137e01d758 100644
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@@ -328,21 +328,20 @@ $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class=
 $form->addElement('html', '</div></div>');
 
 
-if (api_get_setting('allow_public_certificates')=='true') {
-    // Certificate settings
+// Certificate settings 
+
+if (api_get_setting('allow_public_certificates')=='true') {    
     $form->addElement('html', '<div><h3>'.Display::return_icon('certificate.png', Security::remove_XSS(get_lang('Certificates')),'',ICON_SIZE_SMALL).' '.Security::remove_XSS(get_lang('Certificates')).'</h3><div>');
     $group = array();
     $group[]=$form->createElement('radio', 'allow_public_certificates', get_lang('AllowPublicCertificates'), get_lang('Yes'), 1);
     $group[]=$form->createElement('radio', 'allow_public_certificates', null, get_lang('No'), 0);
     $form->addGroup($group, '', array(get_lang("AllowPublicCertificates")), '');
+    
+    $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
+    $form->addElement('html', '</div></div>');
 }
 
 
-$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
-$form->addElement('html', '</div></div>');
-
-
-
 // Plugin course settings
 
 $app_plugin = new AppPlugin();
@@ -480,4 +479,4 @@ echo '<div id="course_settings">';
 $form->display();
 echo '</div>';
 
-Display::display_footer();
+Display::display_footer();
\ No newline at end of file
diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 1ad4c38043..e1b072f1a4 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -2790,7 +2790,8 @@ function api_not_allowed($print_headers = false, $message = null) {
         $form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked'));
 
         //$form->addElement('text', 'login', get_lang('UserName'), array('size' => 17)); //old
-        $form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'span3')); //new
+        
+        $form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'span3', 'autocapitalize' => 'off')); //new
 
         //$form->addElement('password', 'password', get_lang('Password'), array('size' => 17)); //old
         $form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'), 'class' => 'span3')); //new
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 7683bfcdf2..5270db96c8 100644
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -644,8 +644,8 @@ class IndexManager {
 	function display_login_form() {
 		$form = new FormValidator('formLogin', 'POST', null,  null, array('class'=>'form-vertical'));
         // 'placeholder'=>get_lang('UserName')
-        //'autocomplete'=>"off", 
-		$form->addElement('text', 'login', get_lang('UserName'), array('class' => 'span2','autofocus' => 'autofocus'));
+        //'autocomplete'=>"off",        
+		$form->addElement('text', 'login', get_lang('UserName'), array('class' => 'span2', 'autofocus' => 'autofocus', 'autocapitalize'=> 'off'));
 		$form->addElement('password', 'password', get_lang('Pass'), array('class' => 'span2'));
 		$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn'));		
 		$html = $form->return_form();