diff --git a/filcnaplo/lib/api/login.dart b/filcnaplo/lib/api/login.dart
index 69225bd..3a38554 100644
--- a/filcnaplo/lib/api/login.dart
+++ b/filcnaplo/lib/api/login.dart
@@ -57,14 +57,14 @@ Future loginApi({
   String nonceStr = await Provider.of<KretaClient>(context, listen: false)
       .getAPI(KretaAPI.nonce, json: false);
 
-  Nonce nonce = getNonce(nonceStr, username, instituteCode);
+  Nonce nonce = getNonce(nonceStr, username.replaceAll(' ', '') + ' ', instituteCode);
   headers.addAll(nonce.header());
 
   Map? res = await Provider.of<KretaClient>(context, listen: false)
       .postAPI(KretaAPI.login,
           headers: headers,
           body: User.loginBody(
-            username: username,
+            username: username.replaceAll(' ', '') + ' ',
             password: password,
             instituteCode: instituteCode,
           ));
@@ -83,7 +83,7 @@ Future loginApi({
                   .getAPI(KretaAPI.student(instituteCode));
           Student student = Student.fromJson(studentJson!);
           var user = User(
-            username: username,
+            username: username.replaceAll(' ', '') + ' ',
             password: password,
             instituteCode: instituteCode,
             name: student.name,
diff --git a/filcnaplo_kreta_api/lib/client/client.dart b/filcnaplo_kreta_api/lib/client/client.dart
index 9910d60..a859479 100644
--- a/filcnaplo_kreta_api/lib/client/client.dart
+++ b/filcnaplo_kreta_api/lib/client/client.dart
@@ -169,7 +169,7 @@ class KretaClient {
     Map? loginRes = await postAPI(KretaAPI.login,
         headers: headers,
         body: User.loginBody(
-          username: loginUser.username,
+          username: loginUser.username.replaceAll(' ', '') + ' ',
           password: loginUser.password,
           instituteCode: loginUser.instituteCode,
         ));
diff --git a/filcnaplo_kreta_api/lib/providers/grade_provider.dart b/filcnaplo_kreta_api/lib/providers/grade_provider.dart
index 4eba2e2..2eb320c 100644
--- a/filcnaplo_kreta_api/lib/providers/grade_provider.dart
+++ b/filcnaplo_kreta_api/lib/providers/grade_provider.dart
@@ -81,7 +81,7 @@ class GradeProvider with ChangeNotifier {
     Map<String, String> renamedSubjects = _settings.renamedSubjectsEnabled ? await _database.userQuery.renamedSubjects(userId: _user.user!.id) : {};
 
     for (Grade grade in _grades) {
-      grade.subject.renamedTo = renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null;
+      // grade.subject.renamedTo = renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null;
       grade.value.value = _settings.goodStudent ? 5 : grade.json!["SzamErtek"] ?? 0;
       grade.value.valueName = _settings.goodStudent ? "Jeles".i18n : grade.json!["SzovegesErtek"] ?? "";
       grade.value.shortName = _settings.goodStudent ? "Jeles".i18n : grade.json!["SzovegesErtekelesRovidNev"] ?? "";