diff --git a/block_mahara_iena.php b/block_mahara_iena.php
index 1104c7900fbe0cfdfd0f6df76b52922321e18864..c1471224ce39f47e4e01e0c6b1b52e4844c4095e 100644
--- a/block_mahara_iena.php
+++ b/block_mahara_iena.php
@@ -52,7 +52,6 @@ class block_mahara_iena extends block_base
 		require_once ('entity/block_mahara_iena_connexion.php');
 		$connexion = new block_mahara_iena_connexion($CFG->wstoken,$CFG->base_mahara);
 		$is_mahara_user = $connexion->ensure_user_exists_in_mahara($USER);
-
 		$result = $DB->get_records_sql('SELECT * FROM {block_mahara_iena} WHERE course = ?', array($COURSE->id));
 
 		// var_dump($result);
@@ -77,9 +76,17 @@ class block_mahara_iena extends block_base
 				}
 
 			} elseif ( count($result) == 0 && ! $is_mahara_user ) {
-				// connect and create account in mahara for teacher before he can create groupes
-				$this->content->text .= '<a target="_blank" href="'.$CFG->wwwroot . '/blocks/mahara_iena/mahara_iena_link.php?courseid=' . $COURSE->id.'&connect_mahara=true" class="btn btn-block btn-success iena-btn-big">Connexion à '.$CFG->base_mahara.'</a><p class="text-muted">Vous devez vous connecter à '.$CFG->base_mahara.' pour y initialiser votre compte avant d\'utiliser ce block.</p>';
+				if(!isset($this->content->text)){
+					// connect and create account in mahara for teacher before he can create groupes
+					$this->content->text = '<a target="_blank" href="'.$CFG->wwwroot . '/blocks/mahara_iena/mahara_iena_link.php?courseid=' . $COURSE->id.'&connect_mahara=true" class="btn btn-block btn-success iena-btn-big">Connexion à '.$CFG->base_mahara.'</a><p class="text-muted">Vous devez vous connecter à '.$CFG->base_mahara.' pour y initialiser votre compte avant d\'utiliser ce block.</p>';
+						// $this->content->text .= "<div class=\"alert alert-warning\">Vous devez avoir un compte sur <a href=\"$CFG->base_mahara\" target=\"_blank\">$CFG->base_mahara</a> avant de pouvoir créer des groupes sur cette plateforme.</div>";
+				}
+				else{
+					// connect and create account in mahara for teacher before he can create groupes
+					$this->content->text .= '<a target="_blank" href="'.$CFG->wwwroot . '/blocks/mahara_iena/mahara_iena_link.php?courseid=' . $COURSE->id.'&connect_mahara=true" class="btn btn-block btn-success iena-btn-big">Connexion à '.$CFG->base_mahara.'</a><p class="text-muted">Vous devez vous connecter à '.$CFG->base_mahara.' pour y initialiser votre compte avant d\'utiliser ce block.</p>';
 					// $this->content->text .= "<div class=\"alert alert-warning\">Vous devez avoir un compte sur <a href=\"$CFG->base_mahara\" target=\"_blank\">$CFG->base_mahara</a> avant de pouvoir créer des groupes sur cette plateforme.</div>";
+				}
+				
 			}
 
 		}
diff --git a/mahara_iena_groups.php b/mahara_iena_groups.php
index fe4b5ed08ac69fc1d58bc0427dfcd2dee4aeac19..c805d4bf28c0292ec475ba8f497e326e93cbaac1 100644
--- a/mahara_iena_groups.php
+++ b/mahara_iena_groups.php
@@ -107,7 +107,6 @@ if (count($students) == 0) {
 		$resultPost = $connexion->httpPost($params, $murl);
 	// '@' is use because json_decode some time cause fatal error
 		$data = @json_decode($resultPost);
-	// var_dump($data);
 		$result = $DB->get_records_sql('SELECT * FROM {block_mahara_iena} WHERE course = ?', array($COURSE->id));
 	// IF json_decode fail we stop all
 		if ($data == null){
diff --git a/mahara_iena_link.php b/mahara_iena_link.php
index 8fd2a30d7132d1361199824bd4f69dd2bd79108f..cc64f90b8e356c7ce1f184bea8fa350f2ff142d1 100644
--- a/mahara_iena_link.php
+++ b/mahara_iena_link.php
@@ -58,7 +58,6 @@ if ( isset($_GET['connect_mahara']) && $_GET['connect_mahara'] == true ) {
 			redirect($url);
 		}
 	}
-
 }
 
 // if ($_GET['mahara_group']){