diff --git a/hyperfi b/hyperfi
index fd28358..190ee06 100644
--- a/hyperfi
+++ b/hyperfi
@@ -104,13 +104,13 @@ chooselanguage(){
         if [ "${sel}" = "English" ]; then
             loadstrings
         else
-            eval $(curl -L ${baseurl}/lng/${sel} | sed '/^#/ d')
+            eval "$(curl -L "${baseurl}/lng/${sel}" | sed '/^#/ d')"
         fi
         if [ "${skipfont}" = "0" ]; then
-            eval $(setfont ${font})
+            eval "$(setfont "${font}")"
         fi
         font=
-        if [ "$(cat /etc/locale.gen | grep ""#${locale}"")" != "" ]; then
+        if [ "$(grep "^#${locale}" /etc/locale.gen)" != "" ]; then
             sed -i "/#${locale}/s/^#//g" /etc/locale.gen
             locale-gen
         fi