diff --git a/aware-phone/src/main/AndroidManifest.xml b/aware-phone/src/main/AndroidManifest.xml
index e956459cf..aa40cc78d 100755
--- a/aware-phone/src/main/AndroidManifest.xml
+++ b/aware-phone/src/main/AndroidManifest.xml
@@ -75,6 +75,7 @@
             android:theme="@style/Theme.Aware">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
@@ -126,10 +127,17 @@
             android:theme="@style/Theme.Aware">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="aware" />
-                <data android:scheme="aware-ssl" />
+                <data
+                    android:host="*"
+                    android:pathPattern="/index.php/webservice/index/.*"
+                    android:scheme="http" />
+                <data
+                    android:host="*"
+                    android:pathPattern="/index.php/webservice/index/.*"
+                    android:scheme="https" />
             </intent-filter>
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -138,7 +146,8 @@
         <activity android:name=".ui.Aware_Participant" />
 
         <receiver
-            android:name="com.aware.Aware$AndroidPackageMonitor" android:exported="true">
+            android:name="com.aware.Aware$AndroidPackageMonitor"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_ADDED" />
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
@@ -147,8 +156,7 @@
             </intent-filter>
         </receiver>
 
-        <receiver
-            android:name="com.aware.Aware$AwareBoot">
+        <receiver android:name="com.aware.Aware$AwareBoot">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java b/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java
index cfb4fced6..c39b31a0d 100755
--- a/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java
+++ b/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java
@@ -51,6 +51,8 @@ public class Aware_Join_Study extends Aware_Activity {
     public static final String EXTRA_STUDY_URL = "study_url";
 
     private static String study_url;
+    private static String onboarding;
+
     private JSONArray study_configs;
 
     @Override
@@ -95,12 +97,18 @@ public void afterTextChanged(Editable s) {
         //If we are getting here from an AWARE study link
         String scheme = getIntent().getScheme();
         if (scheme != null) {
-            if (Aware.DEBUG)
-                Log.d(Aware.TAG, "AWARE Link detected: " + getIntent().getDataString() + " SCHEME: " + scheme);
-            if (scheme.equalsIgnoreCase("aware")) {
-                study_url = getIntent().getDataString().replace("aware://", "http://");
-            } else if (scheme.equalsIgnoreCase("aware-ssl")) {
-                study_url = getIntent().getDataString().replace("aware-ssl://", "https://");
+
+            if (Aware.DEBUG) Log.d(Aware.TAG, "AWARE Link detected: " + getIntent().getDataString() + " SCHEME: " + scheme);
+
+            study_url = getIntent().getDataString();
+
+            Uri url = Uri.parse(study_url);
+            onboarding = url.getQueryParameter("participant");
+            if (onboarding != null) {
+                participant_label.setText(onboarding);
+                if (Aware.DEBUG) Log.d(Aware.TAG, "AWARE Study participant ID detected: " + onboarding);
+                study_url = study_url.substring(0,study_url.indexOf("participant")-1);
+                if (Aware.DEBUG) Log.d(Aware.TAG, "AWARE Study URL: " + study_url);
             }
         }
 
@@ -376,6 +384,13 @@ protected void onPostExecute(JSONObject result) {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         setResult(Activity.RESULT_CANCELED);
+
+                        //Reset the webservice server status because this one is not valid
+                        Aware.setSetting(getApplicationContext(), Aware_Preferences.STATUS_WEBSERVICE, false);
+
+                        Intent resetClient = new Intent(getApplicationContext(), Aware_Client.class);
+                        resetClient.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+                        startActivity(resetClient);
                         finish();
                     }
                 });
@@ -383,15 +398,6 @@ public void onClick(DialogInterface dialog, int which) {
                 builder.setMessage("Unable to retrieve this study information: " + study_url + "\nTry again.");
                 builder.show();
 
-                //Reset the webservice server status because this one is not valid
-                Aware.setSetting(getApplicationContext(), Aware_Preferences.STATUS_WEBSERVICE, false);
-
-                Intent resetClient = new Intent(getApplicationContext(), Aware_Client.class);
-                resetClient.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(resetClient);
-
-                finish();
-
             } else {
                 try {
                     Cursor dbStudy = Aware.getStudy(getApplicationContext(), study_url);
diff --git a/build.gradle b/build.gradle
index 69cd00df9..23327d857 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         build_tools = "28.0.3"
         aware_libs = "master-SNAPSHOT"
         kotlin_version = '1.3.60'
-        build_gradle = '3.5.3'
+        build_gradle = '3.6.1'
         anko_version = "0.10.8"
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 195c914dc..bb268bbd3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 03 15:15:49 EEST 2019
+#Wed Mar 25 22:09:26 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip