diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..860da66 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/home/HomeFragment.java b/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/home/HomeFragment.java
index 322c316..571292c 100644
--- a/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/home/HomeFragment.java
+++ b/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/home/HomeFragment.java
@@ -109,6 +109,7 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
+        container.getContext();
         View view = inflater.inflate(R.layout.fragment_home, container, false);
         progressDialog = new CustomProgressDialog(getContext(), "");
         Log.i(TAG, "On View Create");
diff --git a/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/main/MainActivity.java b/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/main/MainActivity.java
index 2f0fea3..f8d397a 100644
--- a/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/main/MainActivity.java
+++ b/app/src/main/java/teneocto/thiemjason/tlu_connect/ui/main/MainActivity.java
@@ -197,6 +197,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
 
     /**
      * Handle Facebook Access Token
+     *
      * @param token Facebook Token
      */
     private void handleFacebookAccessToken(AccessToken token) {
@@ -235,11 +236,18 @@ private void handleFacebookAccessToken(AccessToken token) {
 
     /**
      * Register Facebook
+     *
      * @param token Access Token
      */
     private void registerWithFacebook(AccessToken token) {
         UserDTO userDTO = new UserDTO();
-        userDTO.setEmail(mAuth.getCurrentUser().getEmail());
+
+        String userEmail = mAuth.getCurrentUser().getEmail();
+        if (userEmail == null || userEmail.equals("")) {
+            userEmail = "Your email";
+        }
+
+        userDTO.setEmail(userEmail);
         userDTO.setLastName("");
         userDTO.setFirstName(mAuth.getCurrentUser().getDisplayName());
         userDTO.setFirebaseId(mAuth.getCurrentUser().getUid());
diff --git a/app/src/main/res/layout/fragment_profile_infomation.xml b/app/src/main/res/layout/fragment_profile_infomation.xml
index d2803ed..4bd6de0 100644
--- a/app/src/main/res/layout/fragment_profile_infomation.xml
+++ b/app/src/main/res/layout/fragment_profile_infomation.xml
@@ -172,7 +172,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
+                    android:layout_weight="0.65"
                     android:width="0dp"
                     android:fontFamily="@font/lincol"
                     android:gravity="center_vertical"
@@ -184,20 +184,19 @@
                     android:textSize="13sp" />
 
                 <EditText
-                    android:focusable="false"
                     android:id="@+id/profile_email"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_gravity="end"
                     android:layout_marginEnd="6dp"
-                    android:layout_weight="2"
+                    android:layout_weight="2.35"
                     android:width="0dp"
                     android:background="@drawable/table_edittext"
                     android:hint="Enter your email address"
-                    android:maxLength="30"
+                    android:maxLength="40"
                     android:singleLine="true"
                     android:textAlignment="textEnd"
-                    android:textColor="@color/gray_light"
+                    android:textColor="@color/gray_dark"
                     android:textColorHint="@drawable/table_edittext_hint"
                     android:textSize="13sp" />
             </LinearLayout>