Chris Brown will remain in rehab for another two months. The R&B singer appeared in Los Angeles Superior Court on Friday afternoon, for a progress report related to his 2009 assault case on Rihanna. An L.A. County Judge has ordered Brown to return to the anger management and drug rehab program at a Malibu treatment facility.

Continue after the jump…..

According to CNN, Brown’s probation officer says the star “continues to make great improvement.” The judge will decide in an upcoming hearing on April 23 if Chris will be heading to jail for parole violation after allegedly assaulting a man in Washington, D.C. earlier this year.

In addition, TMZ reports the rehab facility has confirmed Brown has diagnosed with bipolar disorder and post-traumatic stress disorder.

Mr. Brown will also require close supervision by his treating physician in order to ensure his bipolar mental health condition remains stable,” legal documents obtained by TMZ states. “It is not uncommon for patients with Post Traumatic Stress Disorder and Bipolar II to use substances to self-medicate their biomedical mood swings and trauma triggers.”

Mr. Brown became aggressive and acted out physically due to his untreated mental health disorder, severe sleep deprivation, inappropriate self-medicating and untreated PTSD,” the facility notes. Taking some time to reflect, Chris hit Twitter with a message to fans below.

Previously: Post-Rehab, But Still Angry: Chris Brown Accuses Longtime Manager of Sabotaging His New Album