diff --git a/html/404.html b/html/404.html
index 7022175..6dd5e71 100644
--- a/html/404.html
+++ b/html/404.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="{{ .cssClass }}">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="{{ .cssClass }}">
     <head>
         <title>404 - jfa-go</title>
         {{ template "header.html" . }}
diff --git a/html/admin.html b/html/admin.html
index 074f5ff..980efa4 100644
--- a/html/admin.html
+++ b/html/admin.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="{{ .cssClass }}">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="{{ .cssClass }}">
     <head>
         {{ template "syntaxhighlighting.html" . }}
         <script>
diff --git a/html/crash.html b/html/crash.html
index 7aaff90..2630b72 100644
--- a/html/crash.html
+++ b/html/crash.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="{{ .shortLang }}">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}">
     <head>
         <!--- This CSS is inlined so we should keep this here! -->
         <link inline rel="stylesheet" type="text/css" href="web/css/v0.6.0bundle.css">
diff --git a/html/create-success.html b/html/create-success.html
index 0105102..6de2bd4 100644
--- a/html/create-success.html
+++ b/html/create-success.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="{{ .cssClass }}">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="{{ .cssClass }}">
     <head>
         {{ template "header.html" . }}
         <title>{{ .strings.successHeader }} - jfa-go</title>
diff --git a/html/form.html b/html/form.html
index 7b09193..c2bc1a6 100644
--- a/html/form.html
+++ b/html/form.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="{{ .cssClass }}">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="{{ .cssClass }}">
     <head>
         {{ template "header.html" . }}
         {{ if .passwordReset }}
diff --git a/html/invalidCode.html b/html/invalidCode.html
index 260e2eb..f9ab645 100644
--- a/html/invalidCode.html
+++ b/html/invalidCode.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="{{ .cssClass }}">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="{{ .cssClass }}">
     <head>
         {{ template "header.html" . }}
         <title>Invalid Code - jfa-go</title>
diff --git a/html/password-reset.html b/html/password-reset.html
index 1e751fd..842b71a 100644
--- a/html/password-reset.html
+++ b/html/password-reset.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="{{ .cssClass }}">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="{{ .cssClass }}">
     <head>
         {{ template "header.html" . }}
         <title>{{ .strings.passwordReset }} -  jfa-go</title>
diff --git a/html/setup.html b/html/setup.html
index fed9f78..0bd4255 100644
--- a/html/setup.html
+++ b/html/setup.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="light">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="light">
     <head>
         {{ template "header.html" . }}
         <title>{{ .lang.Strings.pageTitle }}</title>
diff --git a/html/user.html b/html/user.html
index eb601b3..b1f1124 100644
--- a/html/user.html
+++ b/html/user.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .shortLang }}" class="light">
+<html lang="{{ .shortLang }}" dir="{{ .pageDirection }}" class="light">
     <head>
         <script>
             window.langFile = JSON.parse({{ .language }});
diff --git a/views.go b/views.go
index 69c23f8..cccc42f 100644
--- a/views.go
+++ b/views.go
@@ -128,6 +128,9 @@ func (app *appContext) BasePageTemplateValues(gc *gin.Context, lang string, page
 	} else {
 		shortLang = langComponents[0]
 	}
+	if lang == "pk-pk" || shortLang == "ar" || shortLang == "fa" || shortLang == "he" || shortLang == "iw" || shortLang == "kd" || shortLang == "ps" || shortLang == "ug" || shortLang == "ur" || shortLang == "yi" {
+		set("pageDirection", "rtl")
+	}
 	set("langName", lang)
 	set("shortLang", shortLang)
 }
