diff --git a/.gitmodules b/.gitmodules
index b2ce6eab..b27b7cbc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "/app/src/res/"]
-	path = /app/src/res/
+[submodule "app/src/res/translations"]
+	path = app/src/res/translations/
 	url = https://github.com/k0shk0sh/FastHub-translations.git
diff --git a/app/build.gradle b/app/build.gradle
index 860adc02..464c2ea7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,6 +49,7 @@ android {
                     "src/main/res/layouts/main_layouts",
                     "src/main/res/layouts/row_layouts",
                     "src/main/res/layouts/other_layouts",
+                    "src/main/res/translations",
                     "src/main/res"
             ]
         }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java
index b9b57929..f8c8054b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/login/LoginPresenter.java
@@ -1,5 +1,6 @@
 package com.fastaccess.ui.modules.login;
 
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
@@ -59,10 +60,10 @@ class LoginPresenter extends BasePresenter<LoginMvp.View> implements LoginMvp.Pr
             String authToken = Credentials.basic(username, password);
             AuthModel authModel = new AuthModel();
             authModel.setScopes(Arrays.asList("user", "repo", "gist", "notifications"));
-            authModel.setNote(BuildConfig.APPLICATION_ID + "-" + authToken);//make it unique to FastHub.
+            authModel.setNote(BuildConfig.APPLICATION_ID + "-" + authToken + "-" + Build.MODEL);//make it unique to FastHub.
             authModel.setClientSecret(BuildConfig.GITHUB_SECRET);
             UUID uuid = UUID.randomUUID();
-            String fingerprint = BuildConfig.APPLICATION_ID + " - " + uuid;
+            String fingerprint = BuildConfig.APPLICATION_ID + " - " + uuid + "-" + Build.MODEL;
             Observable<AccessTokenModel> loginCall = LoginProvider.getLoginRestService(authToken)
                     .login(BuildConfig.GITHUB_CLIENT_ID, fingerprint, authModel);
             if (!InputHelper.isEmpty(twoFactorCode)) {
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/translations/values/arrays.xml
similarity index 100%
rename from app/src/main/res/values/arrays.xml
rename to app/src/main/res/translations/values/arrays.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/translations/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to app/src/main/res/translations/values/strings.xml