diff --git a/index.php b/index.php
index 156c861..fbe0e84 100644
--- a/index.php
+++ b/index.php
@@ -3,44 +3,52 @@ require_once("../../config.php");
 
 global $DB;
 
-    $id = required_param('certnumber', PARAM_ALPHANUM);   // certificate code to verify
+    $code = required_param('certnumber', PARAM_ALPHANUM);   // certificate code to verify
 
-	$PAGE->set_pagelayout('standard');
-	$strverify = get_string('verifycertificate', 'block_verify_certificate');
-	$PAGE->set_url('/blocks/verify_certificate/index.php', array('certnumber' => $id));
+    $PAGE->set_pagelayout('standard');
+    $strverify = get_string('verifycertificate', 'block_verify_certificate');
+    $PAGE->set_url('/blocks/verify_certificate/index.php', array('certnumber' => $id));
     $context = get_context_instance(CONTEXT_SYSTEM);
     $PAGE->set_context($context);
 
-	/// Print the header
+    /// Print the header
 
     $PAGE->navbar->add($strverify);
     $PAGE->set_title($strverify);
     $PAGE->set_heading($strverify);
-	$PAGE->requires->css('/blocks/verify_certificate/printstyle.css');
+    $PAGE->requires->css('/blocks/verify_certificate/printstyle.css');
     echo $OUTPUT->header();
-	$certificate = $DB->get_records_sql("SELECT s.*
-                              FROM {certificate_issues} s
-                             WHERE s.code = ?", array($id));
-	if (! $certificate) {
-		echo $OUTPUT->box_start('generalbox boxaligncenter');
+
+    // Print results
+
+    echo $OUTPUT->box_start('generalbox boxaligncenter');
+    if (!$issues = $DB->get_records('certificate_issues', array('code' => $code))) {
         echo get_string('notfound', 'block_verify_certificate');
-		echo $OUTPUT->box_end();
     } else {
-		echo $OUTPUT->box_start('generalbox boxaligncenter');
-		echo "<a title=\""; print_string('printerfriendly', 'certificate');
-		echo "\" href=\"#\" onclick=\"window.print ()\"><div class=\"printicon\">";
-		echo "<img src=\"print.gif\" height=\"16\" width=\"16\" border=\"0\"></img></a></div>";
-	/// Print Section
-		foreach ($certificate as $certrecord) {
-			$certificatedate = userdate($certrecord->timecreated);
-			echo '<p>' . get_string('certificate', 'block_verify_certificate') . ' ' . $certrecord->code . '</p>';
-			echo '<p><b>' . get_string('to', 'block_verify_certificate') . ': </b>' . $certrecord->studentname . '<br />';
-			echo '<p><b>' . get_string('course', 'block_verify_certificate') . ': </b>' . $certrecord->classname . '<br />';
-			echo '<p><b>' . get_string('date', 'block_verify_certificate') . ': </b>' . $certificatedate . '<br /></p>';
-			if ($certrecord->reportgrade != null) {
-				echo '<p><b>' . get_string('grade', 'block_verify_certificate') . ': </b>' . $certrecord->reportgrade . '<br /></p>';
-			}
-		}
-		echo $OUTPUT->box_end();
-	}
-    echo $OUTPUT->footer();
\ No newline at end of file
+        echo "<a title=\""; print_string('printerfriendly', 'certificate');
+        echo "\" href=\"#\" onclick=\"window.print ()\"><div class=\"printicon\">";
+        echo "<img src=\"print.gif\" height=\"16\" width=\"16\" border=\"0\"></img></a></div>";
+        /// Print Section
+        foreach ($issues as $issue) {
+            if (!$certificate = $DB->get_record('certificate', array('id'=> $issue->certificateid))) {
+                print_error('course module is incorrect');
+            }
+            if (!$course = $DB->get_record('course', array('id'=> $certificate->course))) {
+                print_error('course is misconfigured');
+            }
+            if (!$user = $DB->get_record('user', array('id'=> $issue->userid))) {
+                print_error('user is unreachable');
+            }
+            $certificatedate = userdate($issue->timecreated);
+            echo '<p>' . get_string('certificate', 'block_verify_certificate') . ' ' . $issue->code . '</p>';
+            echo '<p><b>' . get_string('to', 'block_verify_certificate') . ': </b>' . fullname($user) . '<br />';
+            echo '<p><b>' . get_string('course', 'block_verify_certificate') . ': </b>' . $course->fullname . '<br />';
+            echo '<p><b>' . get_string('date', 'block_verify_certificate') . ': </b>' . $certificatedate . '<br /></p>';
+            if ($certificate->customtext !== '') {
+                echo '<p><b>' . get_string('customtext', 'block_verify_certificate') . ': </b><br/></p>';
+                echo $certificate->customtext;
+            }
+        }
+    }
+    echo $OUTPUT->box_end();
+    echo $OUTPUT->footer();
diff --git a/lang/de/block_verify_certificate.php b/lang/de/block_verify_certificate.php
index e863964..67b6920 100644
--- a/lang/de/block_verify_certificate.php
+++ b/lang/de/block_verify_certificate.php
@@ -8,4 +8,4 @@ $string['to'] = 'Zuerkannt';
 $string['course'] = 'Kurs';
 $string['date'] = 'Am';
 $string['grade'] = 'Bewertung';
-
+$string['customtext'] = 'Kurs details';
diff --git a/lang/en/block_verify_certificate.php b/lang/en/block_verify_certificate.php
index 577be95..4c91c98 100644
--- a/lang/en/block_verify_certificate.php
+++ b/lang/en/block_verify_certificate.php
@@ -8,4 +8,4 @@ $string['to'] = 'Awarded to';
 $string['course'] = 'Course';
 $string['date'] = 'On';
 $string['grade'] = 'Grade';
-
+$string['customtext'] = 'Course details';
diff --git a/lang/pt_br/block_verify_certificate.php b/lang/pt_br/block_verify_certificate.php
index dcd37b4..b562690 100644
--- a/lang/pt_br/block_verify_certificate.php
+++ b/lang/pt_br/block_verify_certificate.php
@@ -8,4 +8,4 @@ $string['to'] = 'Emitido para';
 $string['course'] = 'Curso';
 $string['date'] = 'Data';
 $string['grade'] = 'Nota';
-
+$string['customtext'] = 'Programa do curso';