diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3df765b8..53c632c4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,18 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" withSubpackages="false" static="false" />
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-          <package name="io.ktor" withSubpackages="true" static="false" />
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/app/src/main/res/navigation/nav_profile.xml b/app/src/main/res/navigation/nav_profile.xml
index 511542c5..9399ba08 100644
--- a/app/src/main/res/navigation/nav_profile.xml
+++ b/app/src/main/res/navigation/nav_profile.xml
@@ -34,6 +34,8 @@
             app:launchSingleTop="true"/>
         <action
             android:id="@+id/action_profileFragment_to_profileSignedOutFragment"
+            app:popUpTo="@id/profileFragment"
+            app:popUpToInclusive="false"
             app:destination="@id/profileSignedOutFragment" />
     </fragment>
 
diff --git a/core/src/main/java/com/fightpandemics/core/data/api/FightPandemicsAPI.kt b/core/src/main/java/com/fightpandemics/core/data/api/FightPandemicsAPI.kt
index 407a5e80..40e386ec 100644
--- a/core/src/main/java/com/fightpandemics/core/data/api/FightPandemicsAPI.kt
+++ b/core/src/main/java/com/fightpandemics/core/data/api/FightPandemicsAPI.kt
@@ -95,7 +95,7 @@ interface FightPandemicsAPI {
 
     // Profile API calls
     @GET("api/users/current")
-    suspend fun getCurrentUser(): IndividualProfileResponse
+    suspend fun getCurrentUser(): Response<IndividualProfileResponse>
 
     @PATCH("api/users/current")
     suspend fun updateCurrentUserProfile(
diff --git a/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSource.kt b/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSource.kt
index ef5b4eaf..a846ddfb 100644
--- a/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSource.kt
+++ b/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSource.kt
@@ -8,7 +8,7 @@ import retrofit2.Response
 
 interface ProfileRemoteDataSource {
 
-    suspend fun fetchCurrentUser(): IndividualProfileResponse
+    suspend fun fetchCurrentUser(): Response<IndividualProfileResponse>
 
     suspend fun updateCurrentUser(patchIndividualProfileRequest: PatchIndividualProfileRequest):
         Response<PatchIndividualProfileResponse>
diff --git a/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSourceImpl.kt b/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSourceImpl.kt
index ce9e76fb..d8b3f550 100644
--- a/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSourceImpl.kt
+++ b/core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSourceImpl.kt
@@ -12,9 +12,8 @@ class ProfileRemoteDataSourceImpl @Inject constructor(
     private val fightPandemicsAPI: FightPandemicsAPI,
 ) : ProfileRemoteDataSource {
 
-    override suspend fun fetchCurrentUser(): IndividualProfileResponse {
-        return fightPandemicsAPI.getCurrentUser()
-    }
+    override suspend fun fetchCurrentUser(): Response<IndividualProfileResponse> =
+        fightPandemicsAPI.getCurrentUser()
 
     override suspend fun updateCurrentUser(patchIndividualProfileRequest: PatchIndividualProfileRequest):
         Response<PatchIndividualProfileResponse> =
diff --git a/core/src/main/java/com/fightpandemics/core/data/repository/ProfileRepositoryImpl.kt b/core/src/main/java/com/fightpandemics/core/data/repository/ProfileRepositoryImpl.kt
index 1b3c1a20..0deea332 100644
--- a/core/src/main/java/com/fightpandemics/core/data/repository/ProfileRepositoryImpl.kt
+++ b/core/src/main/java/com/fightpandemics/core/data/repository/ProfileRepositoryImpl.kt
@@ -1,7 +1,6 @@
 package com.fightpandemics.core.data.repository
 
 import com.fightpandemics.core.data.model.login.ErrorResponse
-import com.fightpandemics.core.data.model.profile.IndividualProfileResponse
 import com.fightpandemics.core.data.model.profile.PatchIndividualAccountRequest
 import com.fightpandemics.core.data.model.profile.PatchIndividualProfileRequest
 import com.fightpandemics.core.data.prefs.PreferenceStorage
@@ -15,7 +14,6 @@ import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.flow
 import java.net.HttpURLConnection
 import javax.inject.Inject
 
@@ -27,10 +25,24 @@ class ProfileRepositoryImpl @Inject constructor(
     private val profileRemoteDataSource: ProfileRemoteDataSource,
 ) : ProfileRepository {
 
-    override fun getIndividualUser(): Flow<Result<IndividualProfileResponse>> {
-        return flow {
-            val individualUser = profileRemoteDataSource.fetchCurrentUser()
-            emit(Result.Success(individualUser))
+    override fun getIndividualUser(): Flow<Result<*>> {
+        return channelFlow {
+            val response = profileRemoteDataSource.fetchCurrentUser()
+            when {
+                response.isSuccessful && response.code() == HttpURLConnection.HTTP_OK -> {
+                    val profileResponse = response.body()
+                    channel.offer(Result.Success(profileResponse))
+                }
+                response.code() == HttpURLConnection.HTTP_BAD_REQUEST -> {
+                    val myError = response.parseErrorJsonResponse<ErrorResponse>(moshi)
+                    channel.offer(Result.Error(Exception(myError?.message)))
+                }
+                else -> {
+                    val myError = response.parseErrorJsonResponse<ErrorResponse>(moshi)
+                    channel.offer(Result.Error(Exception(myError?.message)))
+                }
+            }
+            awaitClose { }
         }
     }
 
diff --git a/core/src/main/java/com/fightpandemics/core/domain/repository/ProfileRepository.kt b/core/src/main/java/com/fightpandemics/core/domain/repository/ProfileRepository.kt
index 4599b75b..44f26c36 100644
--- a/core/src/main/java/com/fightpandemics/core/domain/repository/ProfileRepository.kt
+++ b/core/src/main/java/com/fightpandemics/core/domain/repository/ProfileRepository.kt
@@ -1,6 +1,5 @@
 package com.fightpandemics.core.domain.repository
 
-import com.fightpandemics.core.data.model.profile.IndividualProfileResponse
 import com.fightpandemics.core.data.model.profile.PatchIndividualAccountRequest
 import com.fightpandemics.core.data.model.profile.PatchIndividualProfileRequest
 import com.fightpandemics.core.result.Result
@@ -8,7 +7,7 @@ import kotlinx.coroutines.flow.Flow
 
 interface ProfileRepository {
 
-    fun getIndividualUser(): Flow<Result<IndividualProfileResponse>>
+    fun getIndividualUser(): Flow<Result<*>>
 
     fun updateIndividualUserProfile(profileRequest: PatchIndividualProfileRequest): Flow<Result<*>>
 
diff --git a/profile/src/main/java/com/fightpandemics/profile/domain/LoadCurrentUserUseCase.kt b/profile/src/main/java/com/fightpandemics/profile/domain/LoadCurrentUserUseCase.kt
index acb89949..c4e4a6e1 100644
--- a/profile/src/main/java/com/fightpandemics/profile/domain/LoadCurrentUserUseCase.kt
+++ b/profile/src/main/java/com/fightpandemics/profile/domain/LoadCurrentUserUseCase.kt
@@ -14,9 +14,9 @@ import javax.inject.Inject
 class LoadCurrentUserUseCase @Inject constructor(
     private val profileRepository: ProfileRepository,
     dispatcherProvider: CoroutinesDispatcherProvider,
-) : FlowUseCase<String, IndividualProfileResponse>(dispatcherProvider.default) {
+) : FlowUseCase<String, Any?>(dispatcherProvider.default) {
 
-    override suspend fun execute(parameters: String?): Flow<Result<IndividualProfileResponse>> {
+    override suspend fun execute(parameters: String?): Flow<Result<Any?>> {
         return profileRepository.getIndividualUser().map { results ->
             when (results) {
                 is Result.Success -> results
diff --git a/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileFragment.kt b/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileFragment.kt
index 44a2c4c5..6f7a2b6e 100644
--- a/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileFragment.kt
+++ b/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileFragment.kt
@@ -57,10 +57,6 @@ class ProfileFragment : Fragment() {
         super.onStart()
         bindListeners()
         profileViewModel.getIndividualProfile()
-        if (!profileViewModel.isUserSignedIn()) {
-            findNavController().navigate(com.fightpandemics.R.id.action_profileFragment_to_profileSignedOutFragment)
-            return
-        }
     }
 
     @ExperimentalCoroutinesApi
@@ -98,27 +94,31 @@ class ProfileFragment : Fragment() {
 
     @ExperimentalCoroutinesApi
     private fun getIndividualProfileListener(profile: ProfileViewModel.IndividualProfileViewState) {
-        when {
-            profile.isLoading -> {
-                bindLoading(true)
-            }
-            profile.error == null -> {
-                bindLoading(false)
-                user_full_name.text =
-                    profile.firstName?.capitalizeFirstLetter() + " " + profile.lastName?.capitalizeFirstLetter()
-                user_location.text = profile.location
-                bio.text = profile.bio
-                loadUserImage(profile, profile.imgUrl)
-                facebook.setOnClickListener { openWebView(profile.facebook) }
-                linkedin.setOnClickListener { openWebView(profile.linkedin) }
-                twitter.setOnClickListener { openWebView(profile.twitter) }
-                github.setOnClickListener { openWebView(profile.github) }
-                link.setOnClickListener { openWebView(profile.website) }
-                displayUserPosts(profile.id!!)
-            }
-            profile.error.isNotBlank() -> {
-                bindLoading(false)
-                // TODO add error treatment on get current profile
+        if (!profileViewModel.isUserSignedIn()) {
+            findNavController().navigate(com.fightpandemics.R.id.action_profileFragment_to_profileSignedOutFragment)
+        } else {
+            when {
+                profile.isLoading -> {
+                    bindLoading(true)
+                }
+                profile.error == null -> {
+                    bindLoading(false)
+                    user_full_name.text =
+                        profile.firstName?.capitalizeFirstLetter() + " " + profile.lastName?.capitalizeFirstLetter()
+                    user_location.text = profile.location
+                    bio.text = profile.bio
+                    loadUserImage(profile, profile.imgUrl)
+                    facebook.setOnClickListener { openWebView(profile.facebook) }
+                    linkedin.setOnClickListener { openWebView(profile.linkedin) }
+                    twitter.setOnClickListener { openWebView(profile.twitter) }
+                    github.setOnClickListener { openWebView(profile.github) }
+                    link.setOnClickListener { openWebView(profile.website) }
+                    displayUserPosts(profile.id!!)
+                }
+                profile.error.isNotBlank() -> {
+                    bindLoading(false)
+                    // TODO add error treatment on get current profile
+                }
             }
         }
     }
diff --git a/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileViewModel.kt b/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileViewModel.kt
index c32a4d6e..6c58ae1e 100644
--- a/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileViewModel.kt
+++ b/profile/src/main/java/com/fightpandemics/profile/ui/profile/ProfileViewModel.kt
@@ -88,27 +88,29 @@ class ProfileViewModel @Inject constructor(
                 when (it) {
                     is Result.Success -> {
                         Timber.i("Debug: Result was a success, ${it.data}")
-                        currentProfile = it.data
+                        val data = it.data as IndividualProfileResponse
+                        currentProfile = data
+                        individualProfile.value?.isLoading = false
                         individualProfile.value = IndividualProfileViewState(
                             isLoading = false,
-                            email = it.data.email,
-                            id = it.data.id,
-                            firstName = it.data.firstName.capitalizeFirstLetter(),
-                            lastName = it.data.lastName.capitalizeFirstLetter(),
-                            imgUrl = it.data.photo,
-                            location = it.data.location.city.capitalizeFirstLetter() + " , " +
-                                it.data.location.state.capitalizeFirstLetter() + " , " +
-                                it.data.location.country.capitalizeFirstLetter(),
-                            bio = it.data.about,
-                            facebook = it.data.urls.facebook,
-                            instagram = it.data.urls.instagram,
-                            linkedin = it.data.urls.linkedin,
-                            twitter = it.data.urls.twitter,
-                            github = it.data.urls.github,
-                            website = it.data.urls.website,
+                            email = data.email,
+                            id = data.id,
+                            firstName = data.firstName.capitalizeFirstLetter(),
+                            lastName = data.lastName.capitalizeFirstLetter(),
+                            imgUrl = data.photo,
+                            location = data.location.city.capitalizeFirstLetter() + " , " +
+                                data.location.state.capitalizeFirstLetter() + " , " +
+                                data.location.country.capitalizeFirstLetter(),
+                            bio = data.about,
+                            facebook = data.urls.facebook,
+                            instagram = data.urls.instagram,
+                            linkedin = data.urls.linkedin,
+                            twitter = data.urls.twitter,
+                            github = data.urls.github,
+                            website = data.urls.website,
                             error = null,
-                            objectives = it.data.objectives,
-                            needs = it.data.needs
+                            objectives = data.objectives,
+                            needs = data.needs
                         )
                     }
                     is Result.Error -> {