diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php
index 099541dc..013981d5 100644
--- a/application/language/english/message_lang.php
+++ b/application/language/english/message_lang.php
@@ -298,4 +298,6 @@ $lang['third_rule'] = 'The sum of the % of withdrawals must be lower than the cu
 $lang['fourth_rule'] = 'The sum of the % of deposits must be less than 100.';
 $lang['wallet_created'] = 'New wallet created';
 $lang['wallet_deleted'] = 'Wallet deleted';
+$lang['no_supervisor'] = 'No supervisor';
+$lang['no_geolocated_agent'] = 'No geolocated agent';
 ?>
diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php
index d3dab847..fa8b3d63 100644
--- a/application/language/french/message_lang.php
+++ b/application/language/french/message_lang.php
@@ -306,8 +306,11 @@
    $lang['management_rule'] = 'Règle de gestion';
    $lang['first_rule'] = 'La somme des % des retraits de l\'agent et du superviseur doit être inférieur à 100.';
    $lang['second_rule'] = 'La somme des % des dépots de l\'agent et du superviseur doit être inférieur à 100.';
-   $lang['third_rule'] = 'La somme des % des retraits doit être inférieur au taux client de retrait.';
+   $lang['third_rule'] = 'La somme des % des reuptraits doit être inférieur au taux client de retrait.';
    $lang['fourth_rule'] = 'La somme des % des dépots doit être inférieur à 100.';
    $lang['wallet_created'] = 'Nouveau wallet créé';
    $lang['wallet_deleted'] = 'Wallet supprimé';
+   $lang['no_supervisor'] = 'Aucun superviseur';
+   $lang['no_geolocated_agent'] = 'Aucun utilisateur géolocalisé';
+
 ?>
diff --git a/application/views/header_hyp.php b/application/views/header_hyp.php
index 9dc26397..b638e3af 100644
--- a/application/views/header_hyp.php
+++ b/application/views/header_hyp.php
@@ -220,21 +220,25 @@
 
 							<?php
 							$result=$superviseurs;;
+							if($result){
+								$numrows=$result->num_rows();
 
-							$numrows=$result->num_rows();
+								if ($numrows > 0) { ?>
+									<label for="selected-super"><?php echo $this->lang->line('Superviseur'); ?></label>
+									<select class="form-control input-lg" name="geo_user" id="selected-super" required>
+										<?php foreach($result->result() as $row) {
 
-							if ($numrows > 0) { ?>
-								<label for="selected-super">Superviseur</label>
-								<select class="form-control input-lg" name="geo_user" id="selected-super" required>
-									<?php foreach($result->result() as $row) {
+											echo "<option value='".$row->member_code."'>".$row->lastname." - ".$row->member_code."</option>";
+										} ?>
+									</select>
+								<?php }else{
+									echo $this->lang->line('no_supervisor');
+								}
+								?>
+							<?php } else {
+								echo $this->lang->line('no_supervisor');
+							} ?>
 
-										echo "<option value='".$row->member_code."'>".$row->lastname." - ".$row->member_code."</option>";
-									} ?>
-								</select>
-							<?php }else{
-								echo "Aucun utilisateur gééolocalisé";
-							}
-							?>
 
 						</div>
 						<div class="info-box-content">
diff --git a/application/views/header_sup.php b/application/views/header_sup.php
index 6ea0f630..d762c44d 100644
--- a/application/views/header_sup.php
+++ b/application/views/header_sup.php
@@ -151,21 +151,24 @@
 
 							<?php
 							$result=$geolocated_user;
+							if($result){
+								$numrows=$result->num_rows();
 
-							$numrows=$result->num_rows();
+								if ($numrows > 0) { ?>
+									<label for="selected-geo-user"><?php echo $this->lang->line('Utilisateurs géolocalisés'); ?></label>
+									<select class="form-control input-lg" name="geo_user" id="selected-geo-user" required>
+										<?php foreach($result->result() as $row) {
 
-							if ($numrows > 0) { ?>
-								<label for="selected-geo-user">Utilisateur géolocalisé</label>
-								<select class="form-control input-lg" name="geo_user" id="selected-geo-user" required>
-									<?php foreach($result->result() as $row) {
-
-										echo "<option value='".$row->member_code."'>".$row->lastname." - ".$row->member_code."</option>";
-									} ?>
-								</select>
-							<?php }else{
-								echo "Aucun utilisateur gééolocalisé";
-							}
-							?>
+											echo "<option value='".$row->member_code."'>".$row->lastname." - ".$row->member_code."</option>";
+										} ?>
+									</select>
+								<?php }else{
+									echo $this->lang->line('no_geolocated_agent');
+								}
+								?>
+							<?php }else {
+								echo $this->lang->line('no_geolocated_agent');
+							}?>
 
 						</div>
 						<div class="info-box-content">