diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index f940192..821288d 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -295,6 +295,8 @@ function set_lang() {
 
 	if ($LANG != DEFAULT_LANG ) {
 		include_once("$LANG.po");
+	} else {
+		include_once(DEFAULT_LANG.".po");
 	}
 
 	return;
diff --git a/web/lib/translator.inc b/web/lib/translator.inc
index 8c90551..3c3da2a 100644
--- a/web/lib/translator.inc
+++ b/web/lib/translator.inc
@@ -49,18 +49,18 @@ function __() {
 	# First argument is always string to be translated
 	$tag = $args[0];
 
-	if (empty($LANG) || $LANG == DEFAULT_LANG)
+	if (empty($LANG) || $LANG == DEFAULT_LANG){
 		$translated = $tag;
+	}
+	
+	# If there is no translation, just print the given string.
+	if (empty($_t[$tag])) {
+		$translated = $tag;
+	}
 	else {
-		# If there is no translation, just print the given string.
-		if (empty($_t[$tag])) {
-			$translated = $tag;
-		}
-		else {
-			$translated = $_t[$tag];
-		}
+		$translated = $_t[$tag];
 	}
-
+	
 	$translated = htmlspecialchars($translated, ENT_QUOTES);
 
 	# This condition is to reorganise the arguments in case of