diff --git a/_sakura/components/Templates.php b/_sakura/components/Templates.php
index 874e8d9..53d65c6 100644
--- a/_sakura/components/Templates.php
+++ b/_sakura/components/Templates.php
@@ -67,6 +67,7 @@ class Templates {
 
         // Break line breaks up into array values
         $data = str_replace("\r\n", "\n", $data);
+        $data = str_replace("\r",   "\n", $data);
         $data = explode("\n", $data);
 
         foreach($data as $var) {
diff --git a/_sakura/components/Users.php b/_sakura/components/Users.php
index 78122fa..9e02e64 100644
--- a/_sakura/components/Users.php
+++ b/_sakura/components/Users.php
@@ -695,6 +695,9 @@ class Users {
         // Execute query
         $getUsers = Database::fetch('users', true);
 
+        // Define variable
+        $users = [];
+
         // Reorder shit
         foreach($getUsers as $user) {
 
@@ -717,6 +720,9 @@ class Users {
         // Execute query
         $getRanks = Database::fetch('ranks', true);
 
+        // Define variable
+        $ranks = [];
+
         // Reorder shit
         foreach($getRanks as $rank)
             $ranks[$rank['id']] = $rank;