diff --git a/app/build.gradle b/app/build.gradle
index 6382469da..e27d67047 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         playAccountConfig = playAccountConfigs.defaultAccountConfig
-        manifestPlaceholders = [crashlytics_enabled: project.hasProperty("enableCrashlytics")]
+        manifestPlaceholders = [
+                fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
+                crashlytics_enabled: project.hasProperty("enableCrashlytics")
+        ]
     }
 
     signingConfigs {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 643fd2929..10fe53119 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,6 +62,9 @@
                 android:resource="@xml/provider_widget_timetable" />
         </receiver>
 
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="${fabric_api_key}" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="${crashlytics_enabled}" />
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 58ce34a7e..a1bbc1f05 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -57,16 +57,18 @@ class LoginFormPresenter @Inject constructor(
                     if (it.isEmpty() && !wasEmpty) {
                         showSymbolInput()
                         wasEmpty = true
+                        analytics.logEvent("sign_up_send", mapOf(SUCCESS to false, "students" to 0, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "null" }))
                     } else if (it.isEmpty() && wasEmpty) {
                         showSymbolInput()
                         setErrorSymbolIncorrect()
-                        analytics.logEvent(SIGN_UP, mapOf(SUCCESS to false, "students" to it.size, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "nil" }))
+                        analytics.logEvent("sign_up_send", mapOf(SUCCESS to false, "students" to it.size, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "nil" }))
                     } else {
+                        analytics.logEvent("sign_up_send", mapOf(SUCCESS to true, "students" to it.size, "endpoint" to endpoint, GROUP_ID to symbol))
                         switchOptionsView()
                     }
                 }
             }, {
-                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to true, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "nil" }))
+                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to false, "endpoint" to endpoint, "message" to it.localizedMessage, GROUP_ID to symbol.ifEmpty { "nil" }))
                 errorHandler.dispatch(it)
             }))
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
index af9ae6923..6740d0582 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
@@ -60,7 +60,7 @@ class LoginOptionsPresenter @Inject constructor(
                 }
             }
             .subscribe({
-                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to true, "students" to 1, "endpoint" to student.endpoint, GROUP_ID to student.symbol))
+                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to true, "endpoint" to student.endpoint, "message" to "Success", GROUP_ID to student.symbol))
                 view?.openMainView()
             }, {
                 errorHandler.dispatch(it)
diff --git a/build.gradle b/build.gradle
index 89f697aaf..629b4a48e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,6 @@ allprojects {
         mavenCentral()
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public'}
         maven { url 'https://jitpack.io' }
     }
 }